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

Commit 3423a513 authored by Ricky Wai's avatar Ricky Wai Committed by Android (Google) Code Review
Browse files

Merge "Do not show exception stack trace when no child profile key" into nyc-dev

parents 92d0e9a4 de3a068a

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) {