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

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

Add condition to check case of accessory combinations am: b767df1a 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
parents c61ec502 b767df1a

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

+20 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.net.ConnectivityManager.TETHERING_USB; 
import android.content.Context;

import android.hardware.usb.UsbManager;

import android.net.ConnectivityManager;

import android.util.Log;



import androidx.annotation.VisibleForTesting;

import androidx.preference.PreferenceCategory;
@@ -40,6 +41,9 @@ import java.util.Map; 
public class UsbDetailsFunctionsController extends UsbDetailsController

        implements RadioButtonPreference.OnClickListener {



    private static final String TAG = "UsbFunctionsCtrl";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);



    static final Map<Long, Integer> FUNCTIONS_MAP = new LinkedHashMap<>();



    static {
@@ -88,6 +92,10 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 


    @Override

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

        if (DEBUG) {

            Log.d(TAG, "refresh() connected : " + connected + ", functions : " + functions

                    + ", powerRole : " + powerRole + ", dataRole : " + dataRole);

        }

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

            mProfilesContainer.setEnabled(false);

        } else {
@@ -100,7 +108,7 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
            pref = getProfilePreference(UsbBackend.usbFunctionsToString(option), title);

            // Only show supported options

            if (mUsbBackend.areFunctionsSupported(option)) {

                if (functions == UsbManager.FUNCTION_ACCESSORY) {

                if (isAccessoryMode(functions)) {

                    pref.setChecked(UsbManager.FUNCTION_MTP == option);

                } else {

                    pref.setChecked(functions == option);
@@ -115,6 +123,12 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
    public void onRadioButtonClicked(RadioButtonPreference preference) {

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

        final long previousFunction = mUsbBackend.getCurrentFunctions();

        if (DEBUG) {

            Log.d(TAG, "onRadioButtonClicked() function : " + function + ", toString() : "

                    + UsbManager.usbFunctionsToString(function) + ", previousFunction : "

                    + previousFunction + ", toString() : "

                    + UsbManager.usbFunctionsToString(previousFunction));

        }

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

                && !shouldIgnoreClickEvent(function, previousFunction)) {

            mPreviousFunction = previousFunction;
@@ -140,8 +154,11 @@ public class UsbDetailsFunctionsController extends UsbDetailsController 
    }



    private boolean shouldIgnoreClickEvent(long function, long previousFunction) {

        return previousFunction == UsbManager.FUNCTION_ACCESSORY

                && function == UsbManager.FUNCTION_MTP;

        return isAccessoryMode(previousFunction) && function == UsbManager.FUNCTION_MTP;

    }



    private boolean isAccessoryMode(long function) {

        return (function & UsbManager.FUNCTION_ACCESSORY) != 0;

    }



    @Override

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

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

    }



    @Test

    public void onRadioButtonClicked_functionMtp_inAccessoryCombinationsMode_doNothing() {

        final long function = UsbManager.FUNCTION_ACCESSORY | UsbManager.FUNCTION_AUDIO_SOURCE;

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

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



        mDetailsFunctionsController.mPreviousFunction = function;

        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);



        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(function);

    }



    @Test

    public void onRadioButtonClicked_clickSameButton_doNothing() {

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