From fc78e60a8321e624a49523c38932793af36cf9f8 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 8 Apr 2013 16:05:00 -0700 Subject: [PATCH] Check outInfo is not null Only call keystore if outInfo is not null (cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c) Bug: 8568820 Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28 --- .../server/pm/PackageManagerService.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index c16f0eebe9560..b039d4117001f 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -8221,14 +8221,16 @@ public class PackageManagerService extends IPackageManager.Stub { 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)); + } } } }