From 7a882b5d8d64daaad9377ac7cb5c606aac8c4072 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Thu, 7 May 2015 11:31:32 -0700 Subject: [PATCH] Fix testAuthNeeded test begin now returns OP_AUTH_REQUIRED for per operations with per op authorization instead of NO_ERROR. (cherry-picked from commit b0addbaaf22b14200db602c41a5bd86847bdc0a9) Change-Id: I1f472125f46155833e03ab30bf18363ff51b2c58 --- keystore/tests/src/android/security/KeyStoreTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keystore/tests/src/android/security/KeyStoreTest.java b/keystore/tests/src/android/security/KeyStoreTest.java index 7421120407d97..c68b42b4a49ec 100644 --- 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 { 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",