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

1 files changed, 3 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index cbf7e8038b5b..434464c90a09 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -896,15 +896,13 @@ 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);
-                }
+                Slog.e(TAG, "Failed to decrypt child profile key", e);
             }
         } else {
             if (currentHandle == null) {