diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-27 23:31:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 23:31:38 +0000 |
| commit | 2f0a46cf4fd7f3b7de613f92abf0bec36a499d0e (patch) | |
| tree | 13768986b9f3385123d66e9c4b991d05ece2420d /keystore/tests/src/android/security/AndroidKeyStoreTest.java | |
| parent | 42e9344d51b3d6718200dc19782a650a1cbd3f6c (diff) | |
| parent | 8e7df37c9af178cd443c487f258773c0017501aa (diff) | |
| download | frameworks_base-2f0a46cf4fd7f3b7de613f92abf0bec36a499d0e.zip frameworks_base-2f0a46cf4fd7f3b7de613f92abf0bec36a499d0e.tar.gz frameworks_base-2f0a46cf4fd7f3b7de613f92abf0bec36a499d0e.tar.bz2 | |
am 8e7df37c: am d880dc2f: am 274a4ee3: Merge "Symmetric key import for AndroidKeyStore."
* commit '8e7df37c9af178cd443c487f258773c0017501aa':
Symmetric key import for AndroidKeyStore.
Diffstat (limited to 'keystore/tests/src/android/security/AndroidKeyStoreTest.java')
| -rw-r--r-- | keystore/tests/src/android/security/AndroidKeyStoreTest.java | 2 |
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 }); |