Accidentally removed a check for whether or not the disabled
package setting was null
Bug:
68260103
Test: Manual
Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78
// 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()