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

Merge "Handle renamed packages during default grants" am: 140b101fcd

Browse Source 
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants
This commit is contained in:
Svetoslav Ganov
2015-11-17 20:24:06 +00:00
committed by android-build-merger
parent 68cea4e7d1 60cb22008c
commit 9bf367030c
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

@@ -871,7 +871,7 @@ final class DefaultPermissionGrantPolicy {
return false; return false;
} }
PackageSetting sysPkg = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName); PackageSetting sysPkg = mService.mSettings.getDisabledSystemPkgLPr(pkg.packageName);
if (sysPkg != null) { if (sysPkg != null && sysPkg.pkg != null) {
if ((sysPkg.pkg.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) == 0) { if ((sysPkg.pkg.applicationInfo.flags & ApplicationInfo.FLAG_PERSISTENT) == 0) {
return false; return false;
} }