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

Merge "Schematize ADB system properties"

Browse Source 
am: 750b90a22b

Change-Id: Ic122a93723e15b4a00e061e38e2741af457ed576
This commit is contained in:
Kiyoung Kim
2019-02-12 18:06:33 -08:00
committed by android-build-merger
parent 4d8f4919e0 750b90a22b
commit 974ace22f9
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/development/ClearAdbKeysPreferenceController.java
View File

@@ -20,8 +20,8 @@ import android.content.Context;
import android.hardware.usb.IUsbManager; import android.hardware.usb.IUsbManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.UserManager; import android.os.UserManager;
import android.sysprop.AdbProperties;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -38,9 +38,6 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference
private static final String TAG = "ClearAdbPrefCtrl"; private static final String TAG = "ClearAdbPrefCtrl";
private static final String CLEAR_ADB_KEYS = "clear_adb_keys"; private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
@VisibleForTesting
static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
private final IUsbManager mUsbManager; private final IUsbManager mUsbManager;
private final DevelopmentSettingsDashboardFragment mFragment; private final DevelopmentSettingsDashboardFragment mFragment;
@@ -54,7 +51,7 @@ public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreference
@Override @Override
public boolean isAvailable() { public boolean isAvailable() {
return SystemProperties.getBoolean(RO_ADB_SECURE_PROPERTY_KEY, false /* default */); return AdbProperties.secure().orElse(false);
} }
@Override @Override

19
tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.development; package com.android.settings.development;
import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
@@ -28,7 +27,7 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.hardware.usb.IUsbManager; import android.hardware.usb.IUsbManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.SystemProperties; import android.sysprop.AdbProperties;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -79,21 +78,21 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
public void isAvailable_roAdbSecureEnabled_shouldBeTrue() { public void isAvailable_roAdbSecureEnabled_shouldBeTrue() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
assertThat(mController.isAvailable()).isTrue(); assertThat(mController.isAvailable()).isTrue();
} }
@Test @Test
public void isAvailable_roAdbSecureDisabled_shouldBeFalse() { public void isAvailable_roAdbSecureDisabled_shouldBeFalse() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(false)); AdbProperties.secure(false);
assertThat(mController.isAvailable()).isFalse(); assertThat(mController.isAvailable()).isFalse();
} }
@Test @Test
public void displayPreference_isNotAdminUser_preferenceShouldBeDisabled() { public void displayPreference_isNotAdminUser_preferenceShouldBeDisabled() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(false).when(mController).isAdminUser(); doReturn(false).when(mController).isAdminUser();
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -104,7 +103,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
@Config(shadows = ShadowClearAdbKeysWarningDialog.class) @Config(shadows = ShadowClearAdbKeysWarningDialog.class)
public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() { public void handlePreferenceTreeClick_clearAdbKeysPreference_shouldShowWarningDialog() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(true).when(mController).isAdminUser(); doReturn(true).when(mController).isAdminUser();
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
final String preferenceKey = mController.getPreferenceKey(); final String preferenceKey = mController.getPreferenceKey();
@@ -117,7 +116,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
public void handlePreferenceTreeClick_notClearAdbKeysPreference_shouldReturnFalse() { public void handlePreferenceTreeClick_notClearAdbKeysPreference_shouldReturnFalse() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(true).when(mController).isAdminUser(); doReturn(true).when(mController).isAdminUser();
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
when(mPreference.getKey()).thenReturn("Some random key!!!"); when(mPreference.getKey()).thenReturn("Some random key!!!");
@@ -128,7 +127,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
public void handlePreferenceTreeClick_monkeyUser_shouldReturnFalse() { public void handlePreferenceTreeClick_monkeyUser_shouldReturnFalse() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(true).when(mController).isAdminUser(); doReturn(true).when(mController).isAdminUser();
ShadowUtils.setIsUserAMonkey(true); ShadowUtils.setIsUserAMonkey(true);
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
@@ -142,7 +141,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() { public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(true).when(mController).isAdminUser(); doReturn(true).when(mController).isAdminUser();
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.onDeveloperOptionsSwitchEnabled(); mController.onDeveloperOptionsSwitchEnabled();
@@ -152,7 +151,7 @@ public class ClearAdbKeysPreferenceControllerTest {
@Test @Test
public void onDeveloperOptionsSwitchEnabled_isNotAdminUser_shouldNotEnablePreference() { public void onDeveloperOptionsSwitchEnabled_isNotAdminUser_shouldNotEnablePreference() {
SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true)); AdbProperties.secure(true);
doReturn(false).when(mController).isAdminUser(); doReturn(false).when(mController).isAdminUser();
mController.displayPreference(mScreen); mController.displayPreference(mScreen);
mController.onDeveloperOptionsSwitchEnabled(); mController.onDeveloperOptionsSwitchEnabled();