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

Commit 42f92549 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Temporary use hardcoded counterId."

parents a76a9d4c aea1e39b

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

+3 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ public class KeySyncTask implements Runnable { 
            }

        }



        // TODO: make sure the same counter id is used during recovery and remove temporary fix.

        counterId = 1L;



        byte[] vaultParams = KeySyncUtils.packVaultParams(

                publicKey,

                counterId,

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

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ public class KeySyncTaskTest { 
                KeyDerivationParams.getSalt(),

                TEST_CREDENTIAL);

        Long counterId = mRecoverableKeyStoreDb.getCounterId(TEST_USER_ID, TEST_RECOVERY_AGENT_UID);

        counterId = 1L; // TODO: use value from the database.

        assertThat(counterId).isNotNull();

        byte[] recoveryKey = decryptThmEncryptedKey(

                lockScreenHash,