commit 6954259edbbd233eaa6c45835c1b0d00759c52d5
author Fyodor Kupolov <fkupolov@google.com> Mon May 23 14:22:38 2016 -0700
committer Fyodor Kupolov <fkupolov@google.com> Mon May 23 14:22:38 2016 -0700
tree 77168c5c6ac32e8445e15d6b72515237925afb22
parent 23642330a7e0732976a0c25ca7d54f59055a92d9

Additional clean up in onUserRemovedLPw

mDefaultPermissionsGranted, mFingerprints should be cleaned up.

Bug: 28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16

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

diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 75bd35c..5e22e58 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -4029,7 +4029,7 @@
         file.delete();
         removeCrossProfileIntentFiltersLPw(userId);
 
-        mRuntimePermissionsPersistence.onUserRemoved(userId);
+        mRuntimePermissionsPersistence.onUserRemovedLPw(userId);
 
         writePackageListLPr();
     }
@@ -5134,7 +5134,7 @@
             }
         }
 
-        private void onUserRemoved(int userId) {
+        private void onUserRemovedLPw(int userId) {
             // Make sure we do not
             mHandler.removeMessages(userId);
 
@@ -5145,6 +5145,9 @@
             for (SettingBase sb : mSharedUsers.values()) {
                 revokeRuntimePermissionsAndClearFlags(sb, userId);
             }
+
+            mDefaultPermissionsGranted.delete(userId);
+            mFingerprints.remove(userId);
         }
 
         private void revokeRuntimePermissionsAndClearFlags(SettingBase sb, int userId) {