Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c2b15d authored by Oscar Montemayor's avatar Oscar Montemayor Committed by Android (Google) Code Review
Browse files

Merge "Fix for bug... 

Merge "Fix for bug 2427961	android.security.tests.SystemKeyStoreTest:testBasicAccess is failing. Fixed issues in test."
parents 575c6710 64ef1ce9

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

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class SystemKeyStoreTest extends ActivityUnitTestCase<Activity> { 


    public void testBasicAccess() throws Exception {

        try {

            byte[] newKey = mSysKeyStore.generateNewKey(128, "Blowfish", keyName);

            byte[] newKey = mSysKeyStore.generateNewKey(128, "AES", keyName);

            assertNotNull(newKey);

            byte[] recKey = mSysKeyStore.retrieveKey(keyName);

            assertEquals(newKey.length, recKey.length);
@@ -75,8 +75,9 @@ public class SystemKeyStoreTest extends ActivityUnitTestCase<Activity> { 
            assertNotNull(newKeyStr);

            String recKeyStr = mSysKeyStore.retrieveKeyHexString(keyName2);

            assertEquals(newKeyStr, recKeyStr);



            mSysKeyStore.deleteKey(keyName2);

            String nullKey2 = mSysKeyStore.retrieveKeyHexString(keyName);

            String nullKey2 = mSysKeyStore.retrieveKeyHexString(keyName2);

            assertNull(nullKey2);

        } catch (Exception e) {

            fail();