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

Commit 11115e9c authored by Robert Berry's avatar Robert Berry
Browse files

Remove unused KeyStore field in RecoverableKeyStoreManager 

Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore
Bug: 74944591

Change-Id: Ibe0167adb103beded9eb0138825f4a975f12c29e
parent 52c15f16

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

+0 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ public class RecoverableKeyStoreManager { 
    private final RecoverableKeyGenerator mRecoverableKeyGenerator;

    private final RecoverySnapshotStorage mSnapshotStorage;

    private final PlatformKeyManager mPlatformKeyManager;

    private final KeyStore mKeyStore;

    private final ApplicationKeyStorage mApplicationKeyStorage;



    /**
@@ -126,7 +125,6 @@ public class RecoverableKeyStoreManager { 


            mInstance = new RecoverableKeyStoreManager(

                    context.getApplicationContext(),

                    keystore,

                    db,

                    new RecoverySessionStorage(),

                    Executors.newSingleThreadExecutor(),
@@ -141,7 +139,6 @@ public class RecoverableKeyStoreManager { 
    @VisibleForTesting

    RecoverableKeyStoreManager(

            Context context,

            KeyStore keystore,

            RecoverableKeyStoreDb recoverableKeyStoreDb,

            RecoverySessionStorage recoverySessionStorage,

            ExecutorService executorService,
@@ -150,7 +147,6 @@ public class RecoverableKeyStoreManager { 
            PlatformKeyManager platformKeyManager,

            ApplicationKeyStorage applicationKeyStorage) {

        mContext = context;

        mKeyStore = keystore;

        mDatabase = recoverableKeyStoreDb;

        mRecoverySessionStorage = recoverySessionStorage;

        mExecutorService = executorService;

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

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ public class RecoverableKeyStoreManagerTest { 


        mRecoverableKeyStoreManager = new RecoverableKeyStoreManager(

                mMockContext,

                KeyStore.getInstance(),

                mRecoverableKeyStoreDb,

                mRecoverySessionStorage,

                Executors.newSingleThreadExecutor(),