diff options
| -rw-r--r-- | services/java/com/android/server/usb/UsbDeviceManager.java | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index 0f9c953de2f2..8a5e2914f562 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/java/com/android/server/usb/UsbDeviceManager.java @@ -89,7 +89,6 @@ public class UsbDeviceManager { private static final int MSG_SYSTEM_READY = 3; private static final int MSG_BOOT_COMPLETED = 4; private static final int MSG_USER_SWITCHED = 5; - private static final int MSG_START_ACCESSORY_MODE = 6; private static final int AUDIO_MODE_NONE = 0; private static final int AUDIO_MODE_SOURCE = 1; @@ -152,7 +151,7 @@ public class UsbDeviceManager { mHandler.updateState(state); } else if ("START".equals(accessory)) { if (DEBUG) Slog.d(TAG, "got accessory start"); - mHandler.sendEmptyMessage(MSG_START_ACCESSORY_MODE); + startAccessoryMode(); } } }; @@ -170,7 +169,7 @@ public class UsbDeviceManager { if (nativeIsStartRequested()) { if (DEBUG) Slog.d(TAG, "accessory attached at boot"); - mHandler.sendEmptyMessage(MSG_START_ACCESSORY_MODE); + startAccessoryMode(); } boolean secureAdbEnabled = SystemProperties.getBoolean("ro.adb.secure", false); @@ -232,8 +231,6 @@ public class UsbDeviceManager { functions = UsbManager.USB_FUNCTION_AUDIO_SOURCE; } - if (DEBUG) Slog.d(TAG, "startAccessoryMode: " + functions); - if (functions != null) { mAccessoryModeRequestTime = SystemClock.elapsedRealtime(); setCurrentFunctions(functions, false); @@ -313,7 +310,6 @@ public class UsbDeviceManager { // current USB state private boolean mConnected; private boolean mConfigured; - private boolean mAccessoryStartPending; private String mCurrentFunctions; private String mDefaultFunctions; private UsbAccessory mCurrentAccessory; @@ -620,11 +616,6 @@ public class UsbDeviceManager { case MSG_UPDATE_STATE: mConnected = (msg.arg1 == 1); mConfigured = (msg.arg2 == 1); - - if (!mConnected) { - mAccessoryStartPending = false; - } - updateUsbNotification(); updateAdbNotification(); if (containsFunction(mCurrentFunctions, @@ -638,10 +629,6 @@ public class UsbDeviceManager { updateUsbState(); updateAudioSourceFunction(); } - if (mConnected && mConfigured && mAccessoryStartPending) { - startAccessoryMode(); - mAccessoryStartPending = false; - } break; case MSG_ENABLE_ADB: setAdbEnabled(msg.arg1 == 1); @@ -678,16 +665,6 @@ public class UsbDeviceManager { mCurrentUser = msg.arg1; break; } - case MSG_START_ACCESSORY_MODE: - if (mConnected && mConfigured) { - startAccessoryMode(); - } else { - // we sometimes receive the kernel "accessory start" uevent - // before the "configured" uevent. In this case we need to defer - // handling this event until after we received the configured event - mAccessoryStartPending = true; - } - break; } } |