diff --git a/feature/camera/src/main/java/org/signal/camera/CameraXUtil.kt b/feature/camera/src/main/java/org/signal/camera/CameraXUtil.kt
index 3bed832982..352ae6ec48 100644
--- a/feature/camera/src/main/java/org/signal/camera/CameraXUtil.kt
+++ b/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()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e14f500b0c..adc06236ec 100644
--- a/gradle/libs.versions.toml
+++ b/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"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e194769df3..9aa3f3f17a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -852,6 +852,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -860,6 +868,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -876,6 +892,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -904,6 +928,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -932,6 +964,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -960,6 +1000,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -988,6 +1036,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1016,6 +1072,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1032,6 +1096,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1048,6 +1120,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -1072,6 +1152,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -7896,6 +7984,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+
+
+
+
@@ -13392,6 +13488,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
+
+
+
+
+