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

Commit ae6ec6d2 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Fix RecoverableKeyStore unit tests. 

Bug: 66499222
Test: adb shell am instrument -w -e package \
com.android.server.locksettings.recoverablekeystore \
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I19aeb444e2f99f698cd1f9dfa13215093f5230da
parent 940ba0c8

services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncTask.java

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ public class KeySyncTask implements Runnable { 
                counterId = generateAndStoreCounterId(recoveryAgentUid);

            }

        }



        byte[] vaultParams = KeySyncUtils.packVaultParams(

                publicKey,

                counterId,

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ public class RecoverableKeyStoreManagerTest { 
                    TEST_VAULT_CHALLENGE,

                    ImmutableList.of());

            fail("should have thrown");

        } catch (ServiceSpecificException e) {

        } catch (UnsupportedOperationException e) {

            assertThat(e.getMessage()).startsWith(

                    "Only a single KeychainProtectionParams is supported");

        }

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverySessionStorageTest.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class RecoverySessionStorageTest { 


        storage.remove(TEST_USER_ID, TEST_SESSION_ID);



        assertNotNull(storage.get(TEST_USER_ID, TEST_SESSION_ID));

        assertNotNull(storage.get(TEST_USER_ID, otherSessionId));

    }



    @Test