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

Commit b0967ece authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace NPE with ISE containing more information in AppOpService" into main

parents d6427c5d 8802d403

services/permission/java/com/android/server/permission/access/appop/AppOpService.kt

+5 −1
Original line number Diff line number Diff line
@@ -124,7 +124,11 @@ class AppOpService(private val service: AccessCheckingService) : AppOpsCheckingS 
                // Multiple ops might map to a single permission but only one is considered the

                // runtime appop calculations.

                if (appOpCode == AppOpsManager.permissionToOpCode(permissionName)) {

                    val permission = permissions[permissionName]!!

                    val permission =

                        checkNotNull(permissions[permissionName]) {

                            "Missing permission definition for permission \"$permissionName\"" +

                                " associated with app op $appOpCode"

                        }

                    if (permission.isRuntime) {

                        runtimePermissionNameToAppOp[permissionName] = appOpCode

                        runtimeAppOpToPermissionNames[appOpCode] = permissionName