Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 388a4efc authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Fix NPE in RotationLockTileDataInteractor.hasSufficientPermission 

PackageManager.getRotationResolverPackageName() can return null.
Receiving the return value of it by non-null type, String, causes the
NPE.

Flag: EXEMPT bug fix
Bug: 378736819
Test: manual - SystemUI boots
Change-Id: I8c14fda3f4da82fbefb14914c71f156363624e12
parent 1af6bb4f

packages/SystemUI/src/com/android/systemui/qs/tiles/impl/rotation/domain/interactor/RotationLockTileDataInteractor.kt

+3 −3
Original line number Diff line number Diff line
@@ -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(