From ad9f4939a366cbdc0556c9222f85a48a8a7a35bc Mon Sep 17 00:00:00 2001 From: Lyn Date: Thu, 16 Mar 2023 22:04:46 +0000 Subject: Add null check for opToPermission result before calling updatePermissionFlags Fixes: 271970839 Test: make SettingsGoogle -j40 Change-Id: I8a606f717af5d4a15737a4e1962c582aba3ea4d6 --- .../settingslib/spaprivileged/model/app/AppOpsController.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt index c6090042895e..9f33fcb0052b 100644 --- a/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt +++ b/packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt @@ -62,10 +62,12 @@ class AppOpsController( } val permission = AppOpsManager.opToPermission(op) - packageManager.updatePermissionFlags(permission, app.packageName, - PackageManager.FLAG_PERMISSION_USER_SET, PackageManager.FLAG_PERMISSION_USER_SET, - UserHandle.getUserHandleForUid(app.uid)) - + if (permission != null) { + packageManager.updatePermissionFlags(permission, app.packageName, + PackageManager.FLAG_PERMISSION_USER_SET, + PackageManager.FLAG_PERMISSION_USER_SET, + UserHandle.getUserHandleForUid(app.uid)) + } _mode.postValue(mode) } -- cgit v1.2.3-59-g8ed1b