commit 85e4e818d83dbc65b1e6e3ed9d39c656188acaec
author Paul Crowley <paulcrowley@google.com> Tue May 19 12:42:00 2015 +0100
committer Paul Crowley <paulcrowley@google.com> Fri May 22 16:50:35 2015 +0100
tree 159af6ae6fc7a2878fc7efcc47731aadaf4381b0
parent 9102f5d953fbde03e12f385b2225004edc43d202

Delete the user key when deleting a user.

BUG=19706593

Change-Id: I36ec1b987f5a07450c6a564c74f124ec8d3403ad

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 15d1535a..d859442 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -42,6 +42,7 @@
 import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.os.storage.StorageManager;
 import android.util.AtomicFile;
 import android.util.Log;
 import android.util.Slog;
@@ -1444,6 +1445,8 @@
     }
 
     private void removeUserStateLocked(final int userHandle) {
+        mContext.getSystemService(StorageManager.class)
+            .deleteUserKey(userHandle);
         // Cleanup package manager settings
         mPm.cleanUpUserLILPw(this, userHandle);