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

Merge "Handle renamed packages during default grants" into oc-dev

Browse Source
This commit is contained in:
Todd Kennedy
2017-06-06 23:29:05 +00:00
committed by Android (Google) Code Review
parent 25e509462f 7e79d354a1
commit bfc083c3a0
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/DefaultPermissionGrantPolicy.java
View File

@@ -936,7 +936,7 @@ final class DefaultPermissionGrantPolicy {
// permissions if the version on the system image does not declare them. // permissions if the version on the system image does not declare them.
if (!isDefaultPhoneOrSms && pkg.isUpdatedSystemApp()) { if (!isDefaultPhoneOrSms && pkg.isUpdatedSystemApp()) {
PackageSetting sysPs = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName); PackageSetting sysPs = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName);
if (sysPs != null) { if (sysPs != null && sysPs.pkg != null) {
if (sysPs.pkg.requestedPermissions.isEmpty()) { if (sysPs.pkg.requestedPermissions.isEmpty()) {
return; return;
} }