commit f41024461bf14a768ee39edf5f857e45725ee0fe
author Paul Crowley <paulcrowley@google.com> Tue Mar 29 18:25:10 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 29 18:25:12 2016 +0000
tree eac626b2e784358111abbd85fdd25e942358e4ee
parent 09d83b032e5f456750f2f3149aa4932836643957
parent 91293794bfe2ed9ac7bbb7b652d3fb78665d3b0f

Merge "Continue to remove users when destroyUserKey fails." into nyc-dev

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

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 5263c37..6df36e4 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -2196,7 +2196,13 @@
     }
 
     private void removeUserState(final int userHandle) {
-        mContext.getSystemService(StorageManager.class).destroyUserKey(userHandle);
+        try {
+            mContext.getSystemService(StorageManager.class).destroyUserKey(userHandle);
+        } catch (IllegalStateException e) {
+            // This may be simply because the user was partially created.
+            Slog.i(LOG_TAG,
+                "Destroying key for user " + userHandle + " failed, continuing anyway", e);
+        }
         // Cleanup package manager settings
         mPm.cleanUpUser(this, userHandle);