Merge "Handle renamed packages during default grants"

2015-11-17 19:55:37 +00:00
parent 5603eca33c f443384d9e
commit 140b101fcd
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
+++ b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java
@@ -848,7 +848,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;
            }