diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-11-17 20:24:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-17 20:24:06 +0000 |
| commit | 9bf367030c24e93c711d2ba9ca5594e70a652596 (patch) | |
| tree | 34787c9a86a7908ba688ae5ae0d22a43e0d70010 | |
| parent | 68cea4e7d17cf00ce3001cf23fe36a7f1e77fe86 (diff) | |
| parent | 60cb22008c602c5345504eacb4eb68ea0ac69cf0 (diff) | |
Merge "Handle renamed packages during default grants" am: 140b101fcd
am: 60cb22008c
* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
Handle renamed packages during default grants
| -rw-r--r-- | services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index e4dbf65764d1..8fac9dac4a64 100644 --- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java @@ -871,7 +871,7 @@ final class DefaultPermissionGrantPolicy { return false; } 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) { return false; } |