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

Commit d2d171f0 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Add null check for opToPermission result" into udc-dev am: ab2fd2ef 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22128046



Change-Id: Iadafdd537df67443db28a9c29b6b58f3cf05962d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc7f5690 ab2fd2ef

packages/SettingsLib/SpaPrivileged/src/com/android/settingslib/spaprivileged/model/app/AppOpsController.kt

+6 −4
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ class AppOpsController( 
        }



        val permission = AppOpsManager.opToPermission(op)

        if (permission != null) {

            packageManager.updatePermissionFlags(permission, app.packageName,

                PackageManager.FLAG_PERMISSION_USER_SET, PackageManager.FLAG_PERMISSION_USER_SET,

                    PackageManager.FLAG_PERMISSION_USER_SET,

                    PackageManager.FLAG_PERMISSION_USER_SET,

                    UserHandle.getUserHandleForUid(app.uid))



        }

        _mode.postValue(mode)

    }