summaryrefslogtreecommitdiffstats
path: root/keystore/tests
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-03-27 19:21:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-27 19:21:13 +0000
commit274a4ee3446e76a34a9cfe987e98f7bf4e53f78d (patch)
tree72e5c4457d88fd48f17864be47ac0792bc9d58cc /keystore/tests
parentee80414d0ddd6a27bbf86e0de47dd86bc335431d (diff)
parentbaf2838fd2c7ddf517bd5bd9917551a4706af5b6 (diff)
downloadframeworks_base-274a4ee3446e76a34a9cfe987e98f7bf4e53f78d.zip
frameworks_base-274a4ee3446e76a34a9cfe987e98f7bf4e53f78d.tar.gz
frameworks_base-274a4ee3446e76a34a9cfe987e98f7bf4e53f78d.tar.bz2
Merge "Symmetric key import for AndroidKeyStore."
Diffstat (limited to 'keystore/tests')
-rw-r--r--keystore/tests/src/android/security/AndroidKeyStoreTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java
index 9775e64..7a88dee 100644
--- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java
+++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java
@@ -2127,7 +2127,7 @@ public class AndroidKeyStoreTest extends AndroidTestCase {
assertEquals("The keystore size should match expected", 2, mKeyStore.size());
assertAliases(new String[] { TEST_ALIAS_2, TEST_ALIAS_3 });
- assertTrue(mAndroidKeyStore.delKey(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_3));
+ assertTrue(mAndroidKeyStore.delete(Credentials.USER_PRIVATE_KEY + TEST_ALIAS_3));
assertEquals("The keystore size should match expected", 1, mKeyStore.size());
assertAliases(new String[] { TEST_ALIAS_2 });