From 070fe63962baf30a648f7f85a7d00c177fc8b7c5 Mon Sep 17 00:00:00 2001
From: Andres Morales <anmorales@google.com>
Date: Wed, 24 Jun 2015 10:37:10 -0700
Subject: [PATCH] [LockSettings] clear secure user id when user is removed

Needed for QCOM HALs and for general good housekeeping

Bug: 22011857
Change-Id: I6cc157a88ee125ecbf81fc51c226c63ba1d34b80
---
 .../java/com/android/server/LockSettingsService.java     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index 5436ce020abcf..5cd5f51807bb2 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -701,6 +701,15 @@ public class LockSettingsService extends ILockSettings.Stub {
 
         final KeyStore ks = KeyStore.getInstance();
         ks.onUserRemoved(userId);
+
+        try {
+            final IGateKeeperService gk = getGateKeeperService();
+            if (gk != null) {
+                    gk.clearSecureUserId(userId);
+            }
+        } catch (RemoteException ex) {
+            Slog.w(TAG, "unable to clear GK secure user id");
+        }
     }
 
     private static final String[] VALID_SETTINGS = new String[] {