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

Commit cf6757a7 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Android (Google) Code Review
Browse files

Merge "Schematize Crypto state system property"

parents 827a0fe6 4d7bd6d8

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
@@ -92,7 +92,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);
@@ -106,7 +106,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);