diff options
| author | 2017-06-26 17:18:39 +0000 | |
|---|---|---|
| committer | 2017-06-26 17:18:39 +0000 | |
| commit | c4181096afd64fac2bcf76020c328abe3a66e5d0 (patch) | |
| tree | 3bf6136567de2fc5383b02a7c27d5df8d42439e8 | |
| parent | d587b00830b19f024968c497849768c602334a21 (diff) | |
| parent | b5af86e4443864ad60016ff4cf60c3737eb7ab4b (diff) | |
Merge "null check before dereference" into oc-dev am: df8569787c
am: b5af86e444
Change-Id: I429f077183b4815042c7bfd5661652007eff6b20
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 2 |
1 files changed, 1 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 5501ef110b09..2b35890295e5 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 @@ public class PackageManagerService extends IPackageManager.Stub // 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 = |