commit fbc344172bedab606bc059bafc1d4b13ca97c3a3
author Todd Kennedy <toddke@google.com> Mon Jun 26 07:51:54 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 27 05:57:38 2017 +0000
tree 0dc710c7e57a3f2aa72f8991e3a7636a119180fd
parent c1af814e3c8771bdbce02594aaaf6bfe4fa1d4c1

null check before dereference

Change-Id: I6ae219b68920c160e104b307f60802fd75e705ce
Fixes: 62908319
Test: Manual
(cherry picked from commit 7833e7c5cb628bbf634f8771e00a896a91d43403)

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 70f6a04..141ce2d 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -19960,7 +19960,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 =