diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2019-03-12 22:09:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-12 22:09:34 -0700 |
| commit | 4f56c470527b796a3008c04646d9d85b050aaa70 (patch) | |
| tree | 078ae4a135a58d5fafa3deda9c0d366cff041198 | |
| parent | f90e99ba8222cc6d644e7799ae7ce22eb11d39c9 (diff) | |
| parent | 3e8ec67a68367f455f016926e305393e954a7f7a (diff) | |
| download | TvSettings-4f56c470527b796a3008c04646d9d85b050aaa70.tar.gz | |
Merge "Schematize Crypto state system property" am: 0441d2cd56
am: 3e8ec67a68
Change-Id: I6bf974658d39996b82050252d086986de80f29c3
| -rw-r--r-- | Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java index 5f9436cf7..7b1a19b51 100644 --- a/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java +++ b/Settings/src/com/android/tv/settings/system/development/DevelopmentFragment.java @@ -415,7 +415,8 @@ public class DevelopmentFragment extends SettingsPreferenceFragment IMountService mountService = IMountService.Stub.asInterface(service); if (!mountService.isConvertibleToFBE()) { removePreference(KEY_CONVERT_FBE); - } else if ("file".equals(CryptoProperties.type().orElse("none"))) { + } else if (CryptoProperties.type().orElse(CryptoProperties.type_values.NONE) == + CryptoProperties.type_values.FILE) { convertFbePreference.setEnabled(false); convertFbePreference.setSummary(getResources() .getString(R.string.convert_to_file_encryption_done)); |