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

Merge "Avoid NPE when deleting package during boot." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2016-02-28 00:25:25 +00:00
committed by Android (Google) Code Review
parent 004bf6ade3 b15a71913e
commit b39a4cdd64
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/PackageManagerService.java
View File

@@ -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:"