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

Commit 6c38df5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Schematize Crypto state system property"

parents 13e02af2 7491e86e

src/com/android/settings/development/FileEncryptionPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public class FileEncryptionPreferenceController extends DeveloperOptionsPreferen 


    @Override

    public void updateState(Preference preference) {

        if (!TextUtils.equals("file", CryptoProperties.type().orElse("none"))) {

        if (CryptoProperties.type().orElse(CryptoProperties.type_values.NONE) !=

            CryptoProperties.type_values.FILE) {

            return;

        }

tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class FileEncryptionPreferenceControllerTest { 
        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);

        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);

        mController.displayPreference(mPreferenceScreen);

        CryptoProperties.type("foobar");

        CryptoProperties.type(CryptoProperties.type_values.NONE);



        mController.updateState(mPreference);
@@ -105,7 +105,7 @@ public class FileEncryptionPreferenceControllerTest { 
        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);

        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);

        mController.displayPreference(mPreferenceScreen);

        CryptoProperties.type("file");

        CryptoProperties.type(CryptoProperties.type_values.FILE);



        mController.updateState(mPreference);