Merge "Trust: Add missing cleanup upon removing user"

2016-11-04 00:38:10 +00:00
parent a59ddd7961 ae025828bb
commit 8be6cc89ef
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -1014,6 +1014,9 @@ public class TrustManagerService extends SystemService {
                    synchronized (mDeviceLockedForUser) {
                        mDeviceLockedForUser.delete(userId);
                    }
+                    synchronized (mTrustUsuallyManagedForUser) {
+                        mTrustUsuallyManagedForUser.delete(userId);
+                    }
                    refreshAgentList(userId);
                    refreshDeviceLockedForUser(userId);
                }