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

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

Merge "Stop usb tethering when user cancel it" into rvc-dev am: 53c6c9a6 am: 1659954b 

Change-Id: I21fa2c4c84fa9024f9a76378d3d974647d16b249
parents 4c1d3f20 1659954b

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

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ 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
@@ -129,6 +132,9 @@ 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

+38 −0
Original line number Diff line number Diff line
@@ -270,4 +270,42 @@ 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);

    }

}