Upgrade CameraX to 1.6.1

feature/camera/src/main/java/org/signal/camera/CameraXUtil.kt

@@ -5,14 +5,13 @@
 
 package org.signal.camera
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.hardware.camera2.CameraAccessException
 import android.hardware.camera2.CameraCharacteristics
+import android.hardware.camera2.CameraManager
 import android.hardware.camera2.CameraMetadata
 import android.os.Build
 import androidx.annotation.RequiresApi
-import androidx.camera.camera2.internal.compat.CameraManagerCompat
 import org.signal.core.util.MemoryFileDescriptor
 import org.signal.core.util.logging.Log
 
@@ -55,8 +54,7 @@ object CameraXUtil {
   }
 
   fun getLowestSupportedHardwareLevel(context: Context): Int {
-    @SuppressLint("RestrictedApi")
-    val cameraManager = CameraManagerCompat.from(context.applicationContext).unwrap()
+    val cameraManager = context.applicationContext.getSystemService(Context.CAMERA_SERVICE) as CameraManager
 
     try {
       var supported = maxHardwareLevel()

gradle/libs.versions.toml

@@ -17,7 +17,7 @@ android-gradle-plugin = "9.1.1"
 # Other versions
 androidx-appcompat = "1.7.1"
 androidx-activity = "1.13.0"
-androidx-camera = "1.5.2"
+androidx-camera = "1.6.1"
 androidx-fragment = "1.8.9"
 androidx-lifecycle = "2.10.0"
 androidx-lifecycle-navigation3 = "2.10.0"

gradle/verification-metadata.xml

@@ -852,6 +852,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="dc7f0a836ac8cdd8a8d261b1705efcea3fd195a88b0805b1fb62651846af29c9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-camera2" version="1.6.1">
+         <artifact name="camera-camera2-1.6.1.aar">
+            <sha256 value="10d8f0102468d10a311fdf73695fc29a6a69a738bb0445fbcffd9b9c037cb36b" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-camera2-1.6.1.module">
+            <sha256 value="35697933798ad16f7f747eab66136f944cb33d032c2de6277b98f40d17296ba5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-camera2-pipe" version="1.6.0">
          <artifact name="camera-camera2-pipe-1.6.0.aar">
             <sha256 value="24ccf2f8448cbab58702337bd1e8a79917b04329f85a2f765a40de3bde04798e" origin="Generated by Gradle"/>
@@ -860,6 +868,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="bc54c60670589982f10fb4c748fc8bc63b1d9f33fa84b6a0c52fa5f10a521eaf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-camera2-pipe" version="1.6.1">
+         <artifact name="camera-camera2-pipe-1.6.1.aar">
+            <sha256 value="4254e6f684678a55fafa67cc12197c266250fabb59880ec6a72b521165cf2146" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-camera2-pipe-1.6.1.module">
+            <sha256 value="0876697795696e2f9f91ee345031a1cecd2233f4298b10f1dde4d19c8d53e183" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-compose" version="1.5.2">
          <artifact name="camera-compose-1.5.2.aar">
             <sha256 value="49e5be1069454dc5e63c55ce810072dbed4aa6e90ea575a0497815096bdeefc0" origin="Generated by Gradle"/>
@@ -876,6 +892,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="0e6e54e70f9cd4714bb38e5c32ef5016ab9c897544679de94c51de118f5bc856" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-compose" version="1.6.1">
+         <artifact name="camera-compose-1.6.1.aar">
+            <sha256 value="2802d0e831365c1dd8fb67a63be5d47e235c46f98d8068c595208aebfcd2bf67" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-compose-1.6.1.module">
+            <sha256 value="381dcf5346da943ed8242b185d332cc70cbc87211693bfe78f404870832a377c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-core" version="1.3.4">
          <artifact name="camera-core-1.3.4.aar">
             <md5 value="dcc5f65c776a434a4617c5ebf1b96e6f" origin="Generated by Gradle"/>
@@ -904,6 +928,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="61a1bff9ffb32c311fe362c1b819aa181b91a734b242f015732191ad7209f853" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-core" version="1.6.1">
+         <artifact name="camera-core-1.6.1.aar">
+            <sha256 value="a36f1c323851b51215ba476640e1eb4153882b0c368c0376e9fb905e689df84a" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-core-1.6.1.module">
+            <sha256 value="bda6ef4979ee85bf3e7073ddeff1010e648cbe558d587f2c3a1e4459d0d52e1e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-extensions" version="1.3.4">
          <artifact name="camera-extensions-1.3.4.aar">
             <md5 value="e2bd23e46a0e23a397961ccce7701d83" origin="Generated by Gradle"/>
@@ -932,6 +964,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="f95a4a4722ef43de3f979e54693cce5e3ccce139cd89c0d39dd5d4d38b9b99fb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-extensions" version="1.6.1">
+         <artifact name="camera-extensions-1.6.1.aar">
+            <sha256 value="2f565eb6d7a807cdfe4f0a6c6fc29d26395789b311603bca855dc00200338457" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-extensions-1.6.1.module">
+            <sha256 value="34d5d0737370c2f482990ab7c65572a61da4b3da4c899fc9e4e78624a213e8d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-lifecycle" version="1.3.4">
          <artifact name="camera-lifecycle-1.3.4.aar">
             <md5 value="586e0294e4b1b83f336116e77336b690" origin="Generated by Gradle"/>
@@ -960,6 +1000,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="3b7c6b26390ff5dcfb3ac9f5ca3ad7227d74d1eeea9014222dcf976bb651b0a9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-lifecycle" version="1.6.1">
+         <artifact name="camera-lifecycle-1.6.1.aar">
+            <sha256 value="ad622734db25c8e0ad3dfdc57b00ea478c421aaa7e75fb75d334f1988d7aece0" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-lifecycle-1.6.1.module">
+            <sha256 value="fffbdcf7bb92a3edb75fdccda7220c251d4b1adfd75667bd673c1f4d858ec289" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-video" version="1.3.4">
          <artifact name="camera-video-1.3.4.aar">
             <md5 value="f446a8691018f3c3509e263c66d2168e" origin="Generated by Gradle"/>
@@ -988,6 +1036,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="38be6d8e0c0bacc5b38ce921665f153ae7fca46fdca5e92ea7476d189ffc94dd" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-video" version="1.6.1">
+         <artifact name="camera-video-1.6.1.aar">
+            <sha256 value="d0c2718b722c7ef9fafe1fcfaa352d4da0a1c77d0b175e43739b363996fa1fa1" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-video-1.6.1.module">
+            <sha256 value="d7fe65555fbee492952abdc15ac316ca8dd6ee923b2f8caef9a7f0caeaf8fba5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera" name="camera-view" version="1.3.4">
          <artifact name="camera-view-1.3.4.aar">
             <md5 value="bc61b844861874626dce2dcee7b206c5" origin="Generated by Gradle"/>
@@ -1016,6 +1072,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="00bc2eaaa3a3a7b84b44162dacc667e09fda3c01ecf972e53deeb9358564775f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera" name="camera-view" version="1.6.1">
+         <artifact name="camera-view-1.6.1.aar">
+            <sha256 value="8ef4cfed417712ef4a6f76fd02d48ce0be75a678fcbb551965b3acd59a140da5" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="camera-view-1.6.1.module">
+            <sha256 value="4409aedf65a2f36c0db64aeec576046ee52206464c9b32c66f73bec903c45a9a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera.featurecombinationquery" name="featurecombinationquery" version="1.5.2">
          <artifact name="featurecombinationquery-1.5.2.aar">
             <sha256 value="67e7030f6840bcdd17ec0c50c0acc29bddcab5c206543bed7f5c76baa76330c6" origin="Generated by Gradle"/>
@@ -1032,6 +1096,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="1112c5d6012bccc8302a3e8d029cae6b0a7eacb6d65a147e792414cfdb79239e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera.featurecombinationquery" name="featurecombinationquery" version="1.6.1">
+         <artifact name="featurecombinationquery-1.6.1.aar">
+            <sha256 value="e4c9495a9123e99b711f78e8dcd6a8bd31b338ee8ff56f4915b1e43d43b49bfb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="featurecombinationquery-1.6.1.module">
+            <sha256 value="02eae75a4df896466f8a175b166da4e70dce0440e3a9c9c90a08bae9fa5a7f9b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera.viewfinder" name="viewfinder-compose" version="1.5.2">
          <artifact name="viewfinder-compose-1.5.2.aar">
             <sha256 value="6152d31e75a427968b9ed3ad7648be16feebe502b45e05712455d7e7dcffaa29" origin="Generated by Gradle"/>
@@ -1048,6 +1120,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a0e1c31168921aeba333f399e9b21249b8238a6a153c5889336782cb675d3600" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera.viewfinder" name="viewfinder-compose" version="1.6.1">
+         <artifact name="viewfinder-compose-1.6.1.aar">
+            <sha256 value="c2aa04f9a5b88da49629c086ab3a74680e5c32bfaf964f0201425b06a74b1375" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewfinder-compose-1.6.1.module">
+            <sha256 value="80dfa5b640148bbbe17fac87d7a32719ea8681021bb89d5220cb395fae6eaf38" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.camera.viewfinder" name="viewfinder-core" version="1.5.1">
          <artifact name="viewfinder-core-1.5.1.aar">
             <sha256 value="31179ed5509e4d6d8d667efb91a039cac897b2bfd800d4c6e0b5bed376b4fa69" origin="Generated by Gradle"/>
@@ -1072,6 +1152,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="74fa738fa38ead3a0d5ca117f12a7d2ea372c2c8700bd571211ca1bcc3b6b002" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.camera.viewfinder" name="viewfinder-core" version="1.6.1">
+         <artifact name="viewfinder-core-1.6.1.aar">
+            <sha256 value="824b83c25e143fd9df0842b85b7d8e6317f7ad99b7fe174c1b6150823c9ff022" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="viewfinder-core-1.6.1.module">
+            <sha256 value="a5980eec755e5d404d92a613042e4ce4957779ae499ceaa605e5b65ceb1271ef" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.cardview" name="cardview" version="1.0.0">
          <artifact name="cardview-1.0.0.aar">
             <md5 value="1d3ef7a9d0706960569ad8815a750b67" origin="Generated by Gradle"/>
@@ -7896,6 +7984,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="e22678eed7457db37ceb4f14d96c761fa5055a114b4750892cf42b820a791428" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.media3" name="media3-muxer" version="1.9.1">
+         <artifact name="media3-muxer-1.9.1.aar">
+            <sha256 value="ba5a69b754adad29fe1ef26aa0d200b3fe9d11c16e5910dc1988bd97048f8586" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="media3-muxer-1.9.1.module">
+            <sha256 value="df302bec20cf3a3ad938397965a78bc77bf92e7e2f2ed2a8f63c9a360c3e9413" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.media3" name="media3-session" version="1.10.0">
          <artifact name="media3-session-1.10.0.aar">
             <sha256 value="98d9fe92e6c5bb4fd2c182da6a2a4bc72dd16dd41331cb142e931dea097b1657" origin="Generated by Gradle"/>
@@ -13392,6 +13488,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="32.0.1-android">
+         <artifact name="guava-32.0.1-android.jar">
+            <sha256 value="12429ff9ac33b7afd8b1a5071179757cf4d3c47f0f4099bc0384e644ecbf82dd" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava" version="32.0.1-jre">
          <artifact name="guava-32.0.1-jre.jar">
             <md5 value="6951895e804b36322214c95917e598d4" origin="Generated by Gradle"/>