Merge "Schematize Crypto state system property"

2019-03-13 01:30:58 +00:00
parent 13e02af2ad 7491e86e2b
commit 6c38df5eff
2 changed files with 4 additions and 3 deletions
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -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;
        }