Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6954259e authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Additional clean up in onUserRemovedLPw 

mDefaultPermissionsGranted, mFingerprints should be cleaned up.

Bug: 28913107
Change-Id: I3758985fe742d38e43538b5221fc3f436c55cb16
parent 23642330

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

+5 −2
Original line number Diff line number Diff line
@@ -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) {