Introduce FileEncryptionPreferenceController
- Create new FileEncryptionPreferenceController - Create controller inside the DashboardFragment - Port logic from DevelopmentSettings into the controller Bug: 34203528 Test: make RunSettingsRoboTests -j40 Change-Id: I19f68fa719442bad03fee7ab3939510095257dee
This commit is contained in:
@@ -244,7 +244,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
|||||||
controllers.add(new BluetoothSnoopLogPreferenceController(context));
|
controllers.add(new BluetoothSnoopLogPreferenceController(context));
|
||||||
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
|
controllers.add(new OemUnlockPreferenceController(context, activity, fragment));
|
||||||
// running services
|
// running services
|
||||||
// convert to file encryption
|
controllers.add(new FileEncryptionPreferenceController(context));
|
||||||
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
|
controllers.add(new PictureColorModePreferenceController(context, lifecycle));
|
||||||
// webview implementation
|
// webview implementation
|
||||||
controllers.add(new CoolColorTemperaturePreferenceController(context));
|
controllers.add(new CoolColorTemperaturePreferenceController(context));
|
||||||
|
@@ -0,0 +1,105 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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.support.annotation.VisibleForTesting;
|
||||||
|
import android.support.v7.preference.Preference;
|
||||||
|
import android.support.v7.preference.PreferenceScreen;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
|
||||||
|
public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController {
|
||||||
|
|
||||||
|
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;
|
||||||
|
|
||||||
|
private Preference mPreference;
|
||||||
|
|
||||||
|
public FileEncryptionPreferenceController(Context context) {
|
||||||
|
super(context);
|
||||||
|
|
||||||
|
mStorageManager = getStorageManager();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isAvailable() {
|
||||||
|
if (mStorageManager == null) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
return mStorageManager.isConvertibleToFBE();
|
||||||
|
} catch (RemoteException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getPreferenceKey() {
|
||||||
|
return KEY_CONVERT_FBE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void displayPreference(PreferenceScreen screen) {
|
||||||
|
super.displayPreference(screen);
|
||||||
|
|
||||||
|
mPreference = screen.findPreference(getPreferenceKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateState(Preference preference) {
|
||||||
|
if (!TextUtils.equals("file",
|
||||||
|
SystemProperties.get(FILE_ENCRYPTION_PROPERTY_KEY, "none" /* default */))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mPreference.setEnabled(false);
|
||||||
|
mPreference.setSummary(
|
||||||
|
mContext.getResources().getString(R.string.convert_to_file_encryption_done));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchEnabled() {
|
||||||
|
// intentional no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDeveloperOptionsSwitchDisabled() {
|
||||||
|
// intentional no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
private IStorageManager getStorageManager() {
|
||||||
|
try {
|
||||||
|
return IStorageManager.Stub.asInterface(
|
||||||
|
ServiceManager.getService(KEY_STORAGE_MANAGER));
|
||||||
|
} catch (VerifyError e) {
|
||||||
|
// Used for tests since Robolectric cannot initialize this class.
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,134 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2017 The Android Open Source Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
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;
|
||||||
|
import static org.mockito.Mockito.never;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
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.support.v7.preference.Preference;
|
||||||
|
import android.support.v7.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.TestConfig;
|
||||||
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
|
||||||
|
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
import org.robolectric.util.ReflectionHelpers;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
@Config(manifest = TestConfig.MANIFEST_PATH,
|
||||||
|
sdk = TestConfig.SDK_VERSION,
|
||||||
|
shadows = {SettingsShadowSystemProperties.class})
|
||||||
|
public class FileEncryptionPreferenceControllerTest {
|
||||||
|
|
||||||
|
@Mock
|
||||||
|
private Preference mPreference;
|
||||||
|
@Mock
|
||||||
|
private PreferenceScreen mPreferenceScreen;
|
||||||
|
@Mock
|
||||||
|
private IStorageManager mStorageManager;
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private FileEncryptionPreferenceController mController;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setup() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = RuntimeEnvironment.application;
|
||||||
|
mController = new FileEncryptionPreferenceController(mContext);
|
||||||
|
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
|
||||||
|
mPreference);
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void teardown() {
|
||||||
|
SettingsShadowSystemProperties.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_storageManagerNull_shouldBeFalse() {
|
||||||
|
ReflectionHelpers.setField(mController, "mStorageManager", null);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_notConvertibleToFBE_shouldBeFalse() throws RemoteException {
|
||||||
|
ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
|
||||||
|
when(mStorageManager.isConvertibleToFBE()).thenReturn(false);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isFalse();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void isAvailable_convertibleToFBE_shouldBeTrue() throws RemoteException {
|
||||||
|
ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
|
||||||
|
when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
|
||||||
|
|
||||||
|
assertThat(mController.isAvailable()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingIsNotFile_shouldDoNothing() throws RemoteException {
|
||||||
|
ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
|
||||||
|
when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "foobar");
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference, never()).setEnabled(anyBoolean());
|
||||||
|
verify(mPreference, never()).setSummary(anyString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateState_settingIsFile_shouldSetSummaryAndDisablePreference()
|
||||||
|
throws RemoteException {
|
||||||
|
ReflectionHelpers.setField(mController, "mStorageManager", mStorageManager);
|
||||||
|
when(mStorageManager.isConvertibleToFBE()).thenReturn(true);
|
||||||
|
mController.displayPreference(mPreferenceScreen);
|
||||||
|
SystemProperties.set(FILE_ENCRYPTION_PROPERTY_KEY, "file");
|
||||||
|
|
||||||
|
mController.updateState(mPreference);
|
||||||
|
|
||||||
|
verify(mPreference).setEnabled(false);
|
||||||
|
verify(mPreference).setSummary(
|
||||||
|
mContext.getResources().getString(R.string.convert_to_file_encryption_done));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Reference in New Issue
Block a user