Merge "Snap for 8404905 from f39f9cbac36859597ba9a43b5b0191d560fd7814 to android11-tests-release" into android11-tests-release

1 files changed, 6 insertions, 1 deletions

diff --git a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/src/com/android/cts/authboundkey/AuthBoundKeyAppTest.java b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/src/com/android/cts/authboundkey/AuthBoundKeyAppTest.java
index 1f2adfd9562..6ef0d752b1d 100644
--- a/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/src/com/android/cts/authboundkey/AuthBoundKeyAppTest.java
+++ b/hostsidetests/appsecurity/test-apps/AuthBoundKeyApp/src/com/android/cts/authboundkey/AuthBoundKeyAppTest.java
@@ -74,11 +74,16 @@ public class AuthBoundKeyAppTest extends AndroidTestCase {
         keyStore.load(null);
         try {
             SecretKey secretKey = (SecretKey) keyStore.getKey(KEY_NAME, null);
+            if(secretKey == null) {
+                // Correct behavior as we can also get a null key
+                return;
+            }
         } catch (UnrecoverableKeyException e) {
             // This is correct behavior
             return;
         }
-        fail("Expected an UnrecoverableKeyException");
+
+        fail("Expected a null key");
     }
 
 }