From f443384d9e30111aaa61dac75af1f40d19465e96 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 17 Nov 2015 11:53:18 -0800 Subject: Handle renamed packages during default grants If an L device has a privileged app on the system image which was updated and an M OTA renames the app package (supported only for privileged apps) we end up with a disabled system package setting with no package information. Since we are not doing a null check of the package we get from the disabled package settings during default grants we crash leaving the system in a bad state. bug:25687380 Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4 --- .../core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java index a7682dc06d18..a5c6180396bf 100644 --- 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; } -- cgit v1.2.3-59-g8ed1b