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

am: 7dc288a899 Change-Id: I865d37316469126cf1cd1bf93bd7427882042c3d
2019-03-12 22:09:21 -07:00
parent 6e28351779 7dc288a899
commit 8b8bf4c39e
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;
        }