commit | 69393011471746552f8b5c409c4b65c77be0d595 | [log] [tgz] |
---|---|---|
author | Todd Kennedy <toddke@google.com> | Mon Jun 26 17:10:14 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 26 17:10:14 2017 +0000 |
tree | c180cc90803630dc19c65072c9fafcdc64dee336 | |
parent | 7049137d7f5e445c5be300008bc5f43346084c2f [diff] | |
parent | df8569787ce3278035b0b2e7204cd1b72924a801 [diff] |
Merge "null check before dereference" into oc-dev am: df8569787c Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 5501ef1..2b35890 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -20029,7 +20029,7 @@ // Queue up an async operation since the package deletion may take a little while. mHandler.post(new Runnable() { public void run() { - final PackageSetting ps = (PackageSetting) pkg.mExtras; + final PackageSetting ps = pkg == null ? null : (PackageSetting) pkg.mExtras; boolean doClearData = true; if (ps != null) { final boolean targetIsInstantApp =