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

Commit 9e16092c authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Don't set USB mode if user is a monkey 

Test: tests pass
Fixes: 73246183
Change-Id: I9570c8bd8b11edd6eb0944a4aa766c22b4cc3619
parent 20d8dc09

src/com/android/settings/connecteddevice/usb/UsbDetailsProfilesController.java

+10 −1
Original line number Diff line number Diff line
@@ -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;

        }

        if (!Utils.isMonkeyRunning()) {

            mUsbBackend.setMode(mode);

        }

        return false;

    }



    @Override

    public boolean isAvailable() {

        return !Utils.isMonkeyRunning();

    }



    @Override

    public String getPreferenceKey() {

        return mKey;

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

+8 −0
Original line number Diff line number Diff line
@@ -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++) {