From 6687a2caee0e1ab853c080924a5985fb5be71e28 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 22 Aug 2023 15:46:02 -0700 Subject: 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 Merged-In: Iead08db297fa20963df7ee83b19d5ac76d0d4846 --- .../android/server/permission/access/permission/PermissionService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 de7dc3b53752..44c58e3e78d7 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 @@ -931,7 +931,7 @@ class PermissionService( isGranted: Boolean ) { 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 with(appOpPolicy) { setAppOpMode(packageState.appId, userId, appOpName, mode) } } -- cgit v1.2.3-59-g8ed1b