Merge "Migrate Test Targets to New Android Ownership Model" into main am: 4b7684a7b3 am: 44c2a1fa49
Original change: https://android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/2945330
Change-Id: Icf67d7b85ea8e90e7cca1bb77cffffd7d028b615
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.
