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

Commit eb4abbf5 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

locksettings: only log profile key removal when actually done am: fa5a4b7d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21724586



Change-Id: Id53ef7c858504908d6946ed95f8bb3b5aa4b79c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de0d9466 fa5a4b7d

services/core/java/com/android/server/locksettings/LockSettingsService.java

+10 −5
Original line number Diff line number Diff line
@@ -2322,13 +2322,18 @@ public class LockSettingsService extends ILockSettings.Stub { 
    }



    private void removeKeystoreProfileKey(int targetUserId) {

        Slog.i(TAG, "Remove keystore profile key for user: " + targetUserId);

        final String encryptAlias = PROFILE_KEY_NAME_ENCRYPT + targetUserId;

        final String decryptAlias = PROFILE_KEY_NAME_DECRYPT + targetUserId;

        try {

            mJavaKeyStore.deleteEntry(PROFILE_KEY_NAME_ENCRYPT + targetUserId);

            mJavaKeyStore.deleteEntry(PROFILE_KEY_NAME_DECRYPT + targetUserId);

            if (mJavaKeyStore.containsAlias(encryptAlias) ||

                    mJavaKeyStore.containsAlias(decryptAlias)) {

                Slogf.i(TAG, "Removing keystore profile key for user %d", targetUserId);

                mJavaKeyStore.deleteEntry(encryptAlias);

                mJavaKeyStore.deleteEntry(decryptAlias);

            }

        } catch (KeyStoreException e) {

            // We have tried our best to remove all keys

            Slog.e(TAG, "Unable to remove keystore profile key for user:" + targetUserId, e);

            // We have tried our best to remove the key.

            Slogf.e(TAG, e, "Error removing keystore profile key for user %d", targetUserId);

        }

    }