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

Commit 8b8bf4c3 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

Merge "Schematize Crypto state system property" am: 6c38df5e 

am: 7dc288a8

Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d
parents 6e283517 7dc288a8

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);