Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a078a02c authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

Merge "Schematize Crypto system properties" 

am: b837a447

Change-Id: I55c43d3d1273e2c79ab29c60a714a97d2ca0f264
parents 92fc1385 b837a447

src/com/android/settings/development/FileEncryptionPreferenceController.java

+2 −6
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.settings.development; 
import android.content.Context;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.storage.IStorageManager;

import android.sysprop.CryptoProperties;

import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import android.text.TextUtils;
@@ -35,9 +35,6 @@ public class FileEncryptionPreferenceController extends DeveloperOptionsPreferen 
    private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";

    private static final String KEY_STORAGE_MANAGER = "mount";



    @VisibleForTesting

    static final String FILE_ENCRYPTION_PROPERTY_KEY = "ro.crypto.type";



    private final IStorageManager mStorageManager;



    public FileEncryptionPreferenceController(Context context) {
@@ -66,8 +63,7 @@ public class FileEncryptionPreferenceController extends DeveloperOptionsPreferen 


    @Override

    public void updateState(Preference preference) {

        if (!TextUtils.equals("file",

                SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {

        if (!TextUtils.equals("file", CryptoProperties.type().orElse("none"))) {

            return;

        }

tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java

+3 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.settings.development;



import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY;

import static com.google.common.truth.Truth.assertThat;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;
@@ -26,8 +25,8 @@ import static org.mockito.Mockito.when; 


import android.content.Context;

import android.os.RemoteException;

import android.os.SystemProperties;

import android.os.storage.IStorageManager;

import android.sysprop.CryptoProperties;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;
@@ -92,7 +91,7 @@ public class FileEncryptionPreferenceControllerTest { 
        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);

        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);

        mController.displayPreference(mPreferenceScreen);

        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "foobar");

        CryptoProperties.type("foobar");



        mController.updateState(mPreference);
@@ -106,7 +105,7 @@ public class FileEncryptionPreferenceControllerTest { 
        ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);

        when(mStorageManager.isConvertibleToFBE()).thenReturn(true);

        mController.displayPreference(mPreferenceScreen);

        SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "file");

        CryptoProperties.type("file");



        mController.updateState(mPreference);