diff options
| author | 2023-08-22 15:46:02 -0700 | |
|---|---|---|
| committer | 2024-03-13 17:23:41 -0700 | |
| commit | 5bba209cf2183f44c82075d6a12c25742eb94de6 (patch) | |
| tree | 608e0caf9d0cac8823ce7d8024876e22a7f03dc6 | |
| parent | 936320c44ee7982b4b3946ed671a77ef745f37b4 (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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6687a2caee0e1ab853c080924a5985fb5be71e28)
Merged-In: Iead08db297fa20963df7ee83b19d5ac76d0d4846
Change-Id: Iead08db297fa20963df7ee83b19d5ac76d0d4846
| -rw-r--r-- | services/permission/java/com/android/server/permission/access/permission/PermissionService.kt | 2 |
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 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) } } |