Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3067da37c1

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

Change-Id: I845144d4487a39973427f39c0b93b5a8acbc9f9b
This commit is contained in:
Adrian Roos
2016-05-23 23:28:37 +00:00
committed by android-build-merger
parent dcefb83576 3067da37c1
commit a371f51aab
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/Settings.java
View File

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