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

Commit 8583ef80 authored by Colin Cross's avatar Colin Cross
Browse files

Fix kotlin nullable errors in services.permission 

Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: Iead08db297fa20963df7ee83b19d5ac76d0d4846
parent c993acbf

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -985,7 +985,7 @@ class PermissionService( 
    ) {

    ) {

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

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

            AppIdAppOpPolicy

            AppIdAppOpPolicy

        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) }

    }

    }