From 7491e86e2b262247254cf53e4d094dce5515d79f Mon Sep 17 00:00:00 2001 From: Kiyoung Kim Date: Fri, 22 Feb 2019 13:35:46 +0900 Subject: [PATCH] Schematize Crypto state system property Properties accessed across partitions are now schematized and will become APIs to make explicit interfaces among partitions. Bug: 117924132 Test: m -j Change-Id: I5df6145a436c38dd9fed4325b02ac37a801c2f5e Merged-In: I957a8e37a88f7bb6d5007a36c02952d3539580fe --- .../development/FileEncryptionPreferenceController.java | 3 ++- .../development/FileEncryptionPreferenceControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index 731f4872471..a988fdd9042 100644 --- 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; } diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index afd465aafa3..fb5eaab8f97 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -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);