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

Commit 8802d403 authored by Hai Zhang's avatar Hai Zhang
Browse files

Replace NPE with ISE containing more information in AppOpService 

Bug: 409931296
Test: presubmit
Flag: EXEMPT bugfix
Change-Id: I871d23022368d7f842f76c42e2985fb0f9fa0c57
parent f04795c6

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