commit 206df8c5e5cbebe4dc126ab325bb6ff746ccca85
author Chad Brubaker <cbrubaker@google.com> Fri May 15 19:37:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 19:37:26 2015 +0000
tree 87ef44a8842dab8db3617c0c1c159db70b53e3c7
parent afabc217226c11bad46de4eac557f8fe2e15f708
parent 7a882b5d8d64daaad9377ac7cb5c606aac8c4072

Merge "Fix testAuthNeeded test" into mnc-dev

keystore/tests/src/android/security/KeyStoreTest.java

diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java
index 7421120..c68b42b 100644
--- a/keystore/tests/src/android/security/KeyStoreTest.java
+++ b/keystore/tests/src/android/security/KeyStoreTest.java
@@ -953,7 +953,8 @@
         assertEquals("Generate should succeed", KeyStore.NO_ERROR, rc);
         OperationResult result = mKeyStore.begin(name, KeymasterDefs.KM_PURPOSE_ENCRYPT,
                 true, args, null, out);
-        assertEquals("Begin should succeed", KeyStore.NO_ERROR, result.resultCode);
+        assertEquals("Begin should expect authorization", KeyStore.OP_AUTH_NEEDED,
+                result.resultCode);
         IBinder token = result.token;
         result = mKeyStore.update(token, null, new byte[] {0x01, 0x02, 0x03, 0x04});
         assertEquals("Update should require authorization",