From 6954259edbbd233eaa6c45835c1b0d00759c52d5 Mon Sep 17 00:00:00 2001 From: Fyodor Kupolov Date: Mon, 23 May 2016 14:22:38 -0700 Subject: [PATCH] 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java index 75bd35c0eca4..5e22e580cc5e 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 @@ 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) { -- 2.11.0