From b76be1f8d41c40c8d1d494d296c35ffed1d8ae59 Mon Sep 17 00:00:00 2001 From: "Wu, Hao" Date: Fri, 20 Jul 2012 23:12:14 +0800 Subject: [PATCH] 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 Signed-off-by: Xiaokang Qin Signed-off-by: Bruce Beare Signed-off-by: Jack Ren Author-tracking-BZ: 27200 --- .../settings/deviceinfo/UsbSettings.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java index af279e8ea26..b8290fceac7 100644 --- a/src/com/android/settings/deviceinfo/UsbSettings.java +++ b/src/com/android/settings/deviceinfo/UsbSettings.java @@ -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