Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE

Browse Source 
Accidentally removed a check for whether or not the disabled
package setting was null

Bug: 68260103
Test: Manual
Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78
This commit is contained in:
Todd Kennedy
2017-10-25 15:51:36 -07:00
parent 642daafd2b
commit 1efb833c72
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -1056,7 +1056,7 @@ public class PermissionManagerService {
// before. In this case we do want to allow the app to
// now get the new permission if the ancestral apk is
// privileged to get it.
if (disabledPkg != null
if (disabledPs != null && disabledPkg != null
&& isPackageRequestingPermission(disabledPkg, perm)
&& ((privilegedPermission && disabledPs.isPrivileged())
|| (oemPermission && disabledPs.isOem()