From b15a71913eaea4d2e7063437b3d1a8db5d98c221 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sat, 27 Feb 2016 17:24:26 -0700 Subject: [PATCH] Avoid NPE when deleting package during boot. Bug: 27314561 Change-Id: I7cf854a9db6224ad927ca8c9b4c2641b2841fe7e --- .../core/java/com/android/server/pm/PackageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 3f06c7869ad9c..aa0db995f7c4f 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -14747,7 +14747,7 @@ public class PackageManagerService extends IPackageManager.Stub { return false; } - if (ps.pkg.parentPackage != null && (!isSystemApp(ps) + if (ps.pkg != null && ps.pkg.parentPackage != null && (!isSystemApp(ps) || (flags & PackageManager.DELETE_SYSTEM_APP) != 0)) { if (DEBUG_REMOVE) { Slog.d(TAG, "Uninstalled child package:" + packageName + " for user:"