PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Schematize Crypto state system property

Browse Source 
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.

Bug: 117924132
Test: m -j
Change-Id: I957a8e37a88f7bb6d5007a36c02952d3539580fe
This commit is contained in:
Kiyoung Kim
2019-02-22 13:35:46 +09:00
parent cd1718c9e4
commit 4d7bd6d85e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/development/FileEncryptionPreferenceController.java
View File

@@ -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;
}

4
tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
View File

@@ -92,7 +92,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);
@@ -106,7 +106,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);