Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e

am: 3067da37c1

* commit '3067da37c1e945245274ae638373f200d0ff2d29':
  Additional clean up in onUserRemovedLPw

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b

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

@@ -4029,7 +4029,7 @@ final class Settings {
         file.delete();
         removeCrossProfileIntentFiltersLPw(userId);
 
-        mRuntimePermissionsPersistence.onUserRemoved(userId);
+        mRuntimePermissionsPersistence.onUserRemovedLPw(userId);
 
         writePackageListLPr();
     }
@@ -5134,7 +5134,7 @@ final class Settings {
             }
         }
 
-        private void onUserRemoved(int userId) {
+        private void onUserRemovedLPw(int userId) {
             // Make sure we do not
             mHandler.removeMessages(userId);
 
@@ -5145,6 +5145,9 @@ final class Settings {
             for (SettingBase sb : mSharedUsers.values()) {
                 revokeRuntimePermissionsAndClearFlags(sb, userId);
             }
+
+            mDefaultPermissionsGranted.delete(userId);
+            mFingerprints.remove(userId);
         }
 
         private void revokeRuntimePermissionsAndClearFlags(SettingBase sb, int userId) {