summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuichiro Hanada <yhanada@google.com> 2024-11-13 11:14:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-11-13 11:14:55 +0000
commitbf2a332972f5377835c1ef6ce66aab9d33739e70 (patch)
tree1c8882cb4585612b51db30fbf5622ac181b5663b
parent141c92045b1b8e272ca0620e2e46ba0e1c199318 (diff)
parent388a4efcdfa1b78b50a9daf97ab41d709aa77afa (diff)
Merge "Fix NPE in RotationLockTileDataInteractor.hasSufficientPermission" into main
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt6
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt
index 736e1a5cb9b6..57a60c179581 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt
@@ -75,10 +75,10 @@ constructor(
override fun availability(user: UserHandle): Flow<Boolean> = flowOf(true)
private fun hasSufficientPermission(): Boolean {
- val rotationPackage: String = packageManager.rotationResolverPackageName
- return rotationPackage != null &&
- packageManager.checkPermission(Manifest.permission.CAMERA, rotationPackage) ==
+ return packageManager.rotationResolverPackageName?.let {
+ packageManager.checkPermission(Manifest.permission.CAMERA, it) ==
PackageManager.PERMISSION_GRANTED
+ } ?: false
}
private fun isCameraRotationEnabled(