commit 0eee410e473c1546af80c63ec866655a28833f33
author Kenny Root <kroot@google.com> Mon Apr 08 23:10:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 08 23:10:50 2013 +0000
tree f75ee9f145bce8906dfcdfb9173b655112329f37
parent 605994d6703c1856c4fad397e5b99d299fc80075
parent 3b9933d0c2f2b9a2e973dca296ee45a69087e31c

Merge "Check outInfo is not null" into jb-mr2-dev

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

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index ca7bba2..3d7dd63 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -8647,14 +8647,16 @@
                 mSettings.writeLPr();
             }
         }
-        // A user ID was deleted here. Go through all users and remove it from
-        // KeyStore.
-        final int appId = outInfo.removedAppId;
-        if (appId != -1) {
-            final KeyStore keyStore = KeyStore.getInstance();
-            if (keyStore != null) {
-                for (final int userId : sUserManager.getUserIds()) {
-                    keyStore.clearUid(UserHandle.getUid(userId, appId));
+        if (outInfo != null) {
+            // A user ID was deleted here. Go through all users and remove it
+            // from KeyStore.
+            final int appId = outInfo.removedAppId;
+            if (appId != -1) {
+                final KeyStore keyStore = KeyStore.getInstance();
+                if (keyStore != null) {
+                    for (final int userId : sUserManager.getUserIds()) {
+                        keyStore.clearUid(UserHandle.getUid(userId, appId));
+                    }
                 }
             }
         }