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

Merge "Don't set USB mode if user is a monkey"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-14 02:35:10 +00:00
committed by Android (Google) Code Review
parent bee1a6d990 9e16092cb3
commit 03017fc928
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesController.java
View File

@@ -17,6 +17,8 @@
package com.android.settings.connecteddevice.usb;
import com.android.settings.R;
import com.android.settings.Utils;
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.support.v14.preference.PreferenceFragment;
@@ -136,10 +138,17 @@ public class UsbDetailsProfilesController extends UsbDetailsController
} else {
mode &= ~thisMode;
}
mUsbBackend.setMode(mode);
if (!Utils.isMonkeyRunning()) {
mUsbBackend.setMode(mode);
}
return false;
}
@Override
public boolean isAvailable() {
return !Utils.isMonkeyRunning();
}
@Override
public String getPreferenceKey() {
return mKey;

8
tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesControllerTest.java
View File

@@ -36,6 +36,7 @@ import com.android.settings.TestConfig;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.google.android.collect.Lists;
@@ -228,6 +229,13 @@ public class UsbDetailsProfilesControllerTest {
assertThat(!switches.get(0).isChecked());
}
@Test
@Config(shadows = ShadowUtils.class)
public void testIsAvailable_isMonkey_shouldReturnFalse() {
ShadowUtils.setIsUserAMonkey(true);
assertThat(mDetailsProfilesController.isAvailable()).isFalse();
}
private List<SwitchPreference> getProfileSwitches() {
ArrayList<SwitchPreference> result = new ArrayList<>();
for (int i = 0; i < mPreference.getPreferenceCount(); i++) {