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

Commit 2e928109 authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Do not show exception stack trace when no child profile key" into... 

Merge "Do not show exception stack trace when no child profile key" into nyc-dev am: 3423a513 am: 4566c8c1
am: c3bb85d9

* commit 'c3bb85d9':
  Do not show exception stack trace when no child profile key

Change-Id: I0f2f48bd39da2314117de7e0148772d593750bb2
parents d85fc080 c3bb85d9

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

+3 −5
Original line number Diff line number Diff line
@@ -896,16 +896,14 @@ public class LockSettingsService extends ILockSettings.Stub { 
            // get credential from keystore when managed profile has unified lock

            try {

                savedCredential = getDecryptedPasswordForTiedProfile(userId);

            } catch (FileNotFoundException e) {

                Slog.i(TAG, "Child profile key not found");

            } catch (UnrecoverableKeyException | InvalidKeyException | KeyStoreException

                    | NoSuchAlgorithmException | NoSuchPaddingException

                    | InvalidAlgorithmParameterException | IllegalBlockSizeException

                    | BadPaddingException | CertificateException | IOException e) {

                if (e instanceof FileNotFoundException) {

                    Slog.i(TAG, "Child profile key not found");

                } else {

                Slog.e(TAG, "Failed to decrypt child profile key", e);

            }

            }

        } else {

            if (currentHandle == null) {

                if (savedCredential != null) {