summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-08-22 15:46:02 -0700
committer Colin Cross <ccross@android.com> 2023-08-22 15:47:34 -0700
commit8583ef8052f634f3fc256dc0f9b18e5fba0712bd (patch)
tree01b8073d7d9f1c6a093cb72a864763f4aab514ea
parentc993acbf140b507064d36d2bfc64d9b72ccdaf13 (diff)
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
-rw-r--r--services/permission/java/com/android/server/permission/access/permission/PermissionService.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
index 9a19c2df8791..f0705eda5c43 100644
--- a/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
+++ b/services/permission/java/com/android/server/permission/access/permission/PermissionService.kt
@@ -985,7 +985,7 @@ class PermissionService(
) {
val appOpPolicy = service.getSchemePolicy(UidUri.SCHEME, AppOpUri.SCHEME) as
AppIdAppOpPolicy
- val appOpName = AppOpsManager.permissionToOp(permissionName)
+ val appOpName = checkNotNull(AppOpsManager.permissionToOp(permissionName))
val mode = if (isGranted) AppOpsManager.MODE_ALLOWED else AppOpsManager.MODE_ERRORED
with(appOpPolicy) { setAppOpMode(packageState.appId, userId, appOpName, mode) }
}