Merge "Revert "Prevent monkey from changing usb settings"" (50fb7586) · Commits · e / os / android_packages_apps_Settings

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.support.v7.preference.PreferenceScreen;
		import android.text.TextUtils;
		import android.util.Log;

		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		@@ -76,10 +75,6 @@ public class ClearAdbKeysPreferenceController extends

		@Override
		public boolean handlePreferenceTreeClick(Preference preference) {
		if (Utils.isMonkeyRunning()) {
		return false;
		}

		if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
		ClearAdbKeysWarningDialog.show(mFragment);
		return true;

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import android.support.v7.preference.PreferenceScreen;
		import android.text.TextUtils;

		import com.android.settings.R;
		import com.android.settings.Utils;
		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.core.lifecycle.Lifecycle;
		import com.android.settingslib.core.lifecycle.LifecycleObserver;
		@@ -90,10 +89,6 @@ public class SelectUsbConfigPreferenceController extends

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		if (Utils.isMonkeyRunning()) {
		return false;
		}

		writeUsbConfigurationOption(newValue.toString());
		updateUsbConfigurationValues();
		return true;
		@@ -143,4 +138,5 @@ public class SelectUsbConfigPreferenceController extends
		setCurrentFunction(newValue, true);
		}
		}

		}

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

+1 −17

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.support.v7.preference.PreferenceScreen;
		import com.android.settings.TestConfig;
		import com.android.settings.testutils.SettingsRobolectricTestRunner;
		import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
		import com.android.settings.testutils.shadow.ShadowUtils;

		import org.junit.After;
		import org.junit.Before;
		@@ -55,7 +54,7 @@ import org.robolectric.util.ReflectionHelpers;
		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH,
		sdk = TestConfig.SDK_VERSION,
		shadows = {SettingsShadowSystemProperties.class, ShadowUtils.class})
		shadows = {SettingsShadowSystemProperties.class})
		public class ClearAdbKeysPreferenceControllerTest {

		@Mock
		@@ -84,7 +83,6 @@ public class ClearAdbKeysPreferenceControllerTest {
		public void tearDown() {
		ShadowClearAdbKeysWarningDialog.resetDialog();
		SettingsShadowSystemProperties.clear();
		ShadowUtils.reset();
		}

		@Test
		@@ -138,20 +136,6 @@ public class ClearAdbKeysPreferenceControllerTest {
		assertThat(isHandled).isFalse();
		}

		@Test
		public void handlePreferenceTreeClick_monkeyUser_shouldReturnFalse() {
		SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));
		doReturn(true).when(mController).isAdminUser();
		ShadowUtils.setIsUserAMonkey(true);
		mController.displayPreference(mScreen);
		final String preferenceKey = mController.getPreferenceKey();
		when(mPreference.getKey()).thenReturn(preferenceKey);

		final boolean isHandled = mController.handlePreferenceTreeClick(mPreference);

		assertThat(isHandled).isFalse();
		}

		@Test
		public void onDeveloperOptionsSwitchEnabled_isAdminUser_shouldEnablePreference() {
		SystemProperties.set(RO_ADB_SECURE_PROPERTY_KEY, Boolean.toString(true));

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

+1 −25

Original line number	Diff line number	Diff line
		@@ -16,14 +16,11 @@

		package com.android.settings.development;

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

		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyString;
		import static org.mockito.Mockito.doNothing;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.never;
		import static org.mockito.Mockito.spy;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.when;
		@@ -36,10 +33,8 @@ 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.ShadowUtils;
		import com.android.settingslib.core.lifecycle.Lifecycle;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -49,9 +44,7 @@ import org.robolectric.RuntimeEnvironment;
		import org.robolectric.annotation.Config;

		@RunWith(SettingsRobolectricTestRunner.class)
		@Config(manifest = TestConfig.MANIFEST_PATH,
		sdk = TestConfig.SDK_VERSION,
		shadows = {ShadowUtils.class})
		@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
		public class SelectUsbConfigPreferenceControllerTest {

		@Mock
		@@ -92,11 +85,6 @@ public class SelectUsbConfigPreferenceControllerTest {

		}

		@After
		public void teardown() {
		ShadowUtils.reset();
		}

		@Test
		public void onPreferenceChange_setCharging_shouldEnableCharging() {
		when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);
		@@ -115,18 +103,6 @@ public class SelectUsbConfigPreferenceControllerTest {
		verify(mController).setCurrentFunction(mValues[1], true /* usb data unlock */);
		}

		@Test
		public void onPreferenceChange_monkeyUser_shouldReturnFalse() {
		when(mUsbManager.isFunctionEnabled(mValues[1])).thenReturn(true);
		ShadowUtils.setIsUserAMonkey(true);
		doNothing().when(mController).setCurrentFunction(anyString(), anyBoolean());

		final boolean isHandled = mController.onPreferenceChange(mPreference, mValues[1]);

		assertThat(isHandled).isFalse();
		verify(mController, never()).setCurrentFunction(any(), anyBoolean());
		}

		@Test
		public void updateState_chargingEnabled_shouldSetPreferenceToCharging() {
		when(mUsbManager.isFunctionEnabled(mValues[0])).thenReturn(true);