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

Commit b76be1f8 authored by Wu, Hao's avatar Wu, Hao Committed by Xiaokang Qin
Browse files

UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected. 



Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.

Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@intel.com>
Signed-off-by: default avatarXiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
Signed-off-by: default avatarJack Ren <jack.ren@intel.com>
Author-tracking-BZ: 27200
parent 5dbc1f64

src/com/android/settings/deviceinfo/UsbSettings.java

+18 −0
Original line number Diff line number Diff line
@@ -49,9 +49,15 @@ public class UsbSettings extends SettingsPreferenceFragment { 
    private UsbManager mUsbManager;

    private CheckBoxPreference mMtp;

    private CheckBoxPreference mPtp;

    private boolean mUsbAccessoryMode;



    private final BroadcastReceiver mStateReceiver = new BroadcastReceiver() {

        public void onReceive(Context content, Intent intent) {

            String action = intent.getAction();

            if (action.equals(UsbManager.ACTION_USB_STATE)) {

               mUsbAccessoryMode = intent.getBooleanExtra(UsbManager.USB_FUNCTION_ACCESSORY, false);

               Log.e(TAG, "UsbAccessoryMode " + mUsbAccessoryMode);

            }

            updateToggles(mUsbManager.getDefaultFunction());

        }

    };
@@ -106,6 +112,18 @@ public class UsbSettings extends SettingsPreferenceFragment { 
            mMtp.setChecked(false);

            mPtp.setChecked(false);

        }



        if (!mUsbAccessoryMode) {

            //Enable MTP and PTP switch while USB is not in Accessory Mode, otherwise disable it

            Log.e(TAG, "USB Normal Mode");

            mMtp.setEnabled(true);

            mPtp.setEnabled(true);

        } else {

            Log.e(TAG, "USB Accessory Mode");

            mMtp.setEnabled(false);

            mPtp.setEnabled(false);

        }



    }



    @Override