Merge "null check before dereference" into oc-dev

am: df8569787c Change-Id: I41f9298e305f6f197120f2b3128187a4cbf6b28a
2017-06-26 17:10:13 +00:00
parent 01741762d8 df8569787c
commit b5af86e444
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19977,7 +19977,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 =