am 206df8c5: Merge "Fix testAuthNeeded test" into mnc-dev

* commit '206df8c5e5cbebe4dc126ab325bb6ff746ccca85': Fix testAuthNeeded test
2015-05-15 19:45:06 +00:00
parent 62b845b73c 206df8c5e5
commit 8dae979ae4
1 changed files with 2 additions and 1 deletions
--- a/keystore/tests/src/android/security/KeyStoreTest.java
+++ b/keystore/tests/src/android/security/KeyStoreTest.java
@@ -953,7 +953,8 @@ public class KeyStoreTest extends ActivityUnitTestCase<Activity> {
        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",