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

Commit 270646db authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Stop usb tethering when user cancel it"" into rvc-dev am: 74755ac9 am: d3d9b3d4 

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

Change-Id: I7abcc9e2109bf66e00b14bd8d72457622e392643
parents a52b40c1 d3d9b3d4

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

+0 −6
Original line number Diff line number Diff line
@@ -89,9 +89,6 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
    @Override

    protected void refresh(boolean connected, long functions, int powerRole, int dataRole) {

        if (!connected || dataRole != DATA_ROLE_DEVICE) {

            if (mPreviousFunction == UsbManager.FUNCTION_RNDIS) {

                mConnectivityManager.stopTethering(TETHERING_USB);

            }

            mProfilesContainer.setEnabled(false);

        } else {

            // Functions are only available in device mode
@@ -132,9 +129,6 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
                mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,

                        mOnStartTetheringCallback);

            } else {

                if (mPreviousFunction == UsbManager.FUNCTION_RNDIS) {

                    mConnectivityManager.stopTethering(TETHERING_USB);

                }

                mUsbBackend.setCurrentFunctions(function);

            }

        }

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

+0 −38
Original line number Diff line number Diff line
@@ -270,42 +270,4 @@ public class UsbDetailsFunctionsControllerTest { 


        verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);

    }



    @Test

    public void refresh_previousFunctionIsRndis_stopTethering() {

        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_RNDIS;



        mDetailsFunctionsController.refresh(false, 0, 0, 0);



        verify(mConnectivityManager).stopTethering(TETHERING_USB);

    }



    @Test

    public void refresh_previousFunctionIsNotRndis_doNothing() {

        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_MIDI;



        mDetailsFunctionsController.refresh(false, 0, 0, 0);



        verify(mConnectivityManager, never()).stopTethering(TETHERING_USB);

    }



    @Test

    public void onRadioButtonClicked_previousFunctionIsRndis_stopTethering() {

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

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



        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);



        verify(mConnectivityManager).stopTethering(TETHERING_USB);

    }



    @Test

    public void onRadioButtonClicked_previousFunctionIsNotRndis_doNothing() {

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

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



        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);



        verify(mConnectivityManager, never()).stopTethering(TETHERING_USB);

    }

}