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

Commit c6fa90ec authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Fix kotlin nullable errors in services.permission" into udc-dev-plus-aosp am: 63d99ccb 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24517143



Change-Id: I24aded943fadf1df56ffaf80f9863d0488160c9f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12ace5ea 63d99ccb

services/permission/java/com/android/server/permission/access/permission/PermissionService.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -931,7 +931,7 @@ class PermissionService( 
        isGranted: Boolean

        isGranted: Boolean

    ) {

    ) {

        val appOpPolicy = service.getSchemePolicy(UidUri.SCHEME, AppOpUri.SCHEME) as UidAppOpPolicy

        val appOpPolicy = service.getSchemePolicy(UidUri.SCHEME, AppOpUri.SCHEME) as UidAppOpPolicy

        val appOpName = AppOpsManager.permissionToOp(permissionName)

        val appOpName = checkNotNull(AppOpsManager.permissionToOp(permissionName))

        val mode = if (isGranted) AppOpsManager.MODE_ALLOWED else AppOpsManager.MODE_ERRORED

        val mode = if (isGranted) AppOpsManager.MODE_ALLOWED else AppOpsManager.MODE_ERRORED

        with(appOpPolicy) { setAppOpMode(packageState.appId, userId, appOpName, mode) }

        with(appOpPolicy) { setAppOpMode(packageState.appId, userId, appOpName, mode) }

    }

    }