[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 574807694f -s ours am: 12cb95c0a4 -s ours
am skip reason: Merged-In I6dcbe0dddbda0734a3e8351c79d0329ae26a2db6 with SHA-1 2e555bb246 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2990861
Change-Id: Icb12f3a19a413e63592702c6b710e47751f054d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 6b09d78..5732be4 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -208,7 +208,7 @@
Log.e(TAG, "interrupted while checking if key is user-selectable", ignored);
Thread.currentThread().interrupt();
return false;
- } catch (Exception ignored) {
+ } catch (Exception | AssertionError ignored) {
Log.e(TAG, "error while checking if key is user-selectable", ignored);
return false;
}
@@ -341,7 +341,7 @@
}
}
callback.alias(chosenAlias);
- } catch (InterruptedException | RemoteException e) {
+ } catch (InterruptedException | RemoteException | AssertionError e) {
Log.e(TAG, "Unable to request find predefined alias from credential "
+ "management app policy");
// Proceed without a suggested alias.
