diff options
| author | 2020-09-22 23:46:00 +0000 | |
|---|---|---|
| committer | 2020-09-22 23:46:00 +0000 | |
| commit | 1050e5b066307757e9150ee12f65e4f3d3027aa1 (patch) | |
| tree | 96e78c333b138ba9435220c31494d868a1da713d | |
| parent | 5b730482e8b2afc165b6fb35f7de077e0b96572e (diff) | |
| parent | f019dbc7fa54b3088b4cc9ae7f4d5f034fea8ba9 (diff) | |
Merge "Add null check for package in setEnabledSetting"
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 16424d214995..f94de227f3e9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -21242,7 +21242,8 @@ public class PackageManagerService extends IPackageManager.Stub // Prior to enabling the package, we need to decompress the APK(s) to the // data partition and then replace the version on the system partition. final AndroidPackage deletedPkg = pkgSetting.pkg; - final boolean isSystemStub = deletedPkg.isStub() + final boolean isSystemStub = (deletedPkg != null) + && deletedPkg.isStub() && deletedPkg.isSystem(); if (isSystemStub && (newState == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT |