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

Commit c61ec502 authored by Hugh Chen's avatar Hugh Chen Committed by Automerger Merge Worker
Browse files

Do nothing when choosing file transfer when in accessory mode am: e8dc7bc2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
parents 2676dd76 e8dc7bc2

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

+7 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
    public void onRadioButtonClicked(RadioButtonPreference preference) {

        final long function = UsbBackend.usbFunctionsFromString(preference.getKey());

        final long previousFunction = mUsbBackend.getCurrentFunctions();

        if (function != previousFunction && !Utils.isMonkeyRunning()) {

        if (function != previousFunction && !Utils.isMonkeyRunning()

                && !shouldIgnoreClickEvent(function, previousFunction)) {

            mPreviousFunction = previousFunction;



            //Update the UI in advance to make it looks smooth
@@ -138,6 +139,11 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
        }

    }



    private boolean shouldIgnoreClickEvent(long function, long previousFunction) {

        return previousFunction == UsbManager.FUNCTION_ACCESSORY

                && function == UsbManager.FUNCTION_MTP;

    }



    @Override

    public boolean isAvailable() {

        return !Utils.isMonkeyRunning();

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

+12 −0
Original line number Diff line number Diff line
@@ -263,6 +263,18 @@ public class UsbDetailsFunctionsControllerTest { 
                UsbManager.FUNCTION_MTP);

    }



    @Test

    public void onRadioButtonClicked_functionMtp_inAccessoryMode_doNothing() {

        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));

        doReturn(UsbManager.FUNCTION_ACCESSORY).when(mUsbBackend).getCurrentFunctions();



        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_ACCESSORY;

        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);



        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(

                UsbManager.FUNCTION_ACCESSORY);

    }



    @Test

    public void onRadioButtonClicked_clickSameButton_doNothing() {

        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));