drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1

Browse Source
This commit is contained in:
Mike Lockwood
2011-03-29 22:14:27 -07:00
committed by Android (Google) Code Review
parent 0664a4b18c 4f0f3561ed
commit 44e4b99f82
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/java/com/android/server/usb/UsbService.java
View File

@ -561,11 +561,14 @@ public class UsbService extends IUsbManager.Stub {
case MSG_UPDATE_STATE: case MSG_UPDATE_STATE:
if (mConnected != mLastConnected || mConfiguration != mLastConfiguration) { if (mConnected != mLastConnected || mConfiguration != mLastConfiguration) {
if (mConnected == 0) { if (mConnected == 0) {
// make sure accessory mode is off, and restore default functions if (UsbManager.isFunctionEnabled(
if (mCurrentAccessory != null && UsbManager.setFunctionEnabled( UsbManager.USB_FUNCTION_ACCESSORY)) {
UsbManager.USB_FUNCTION_ACCESSORY, false)) { // make sure accessory mode is off, and restore default functions
Log.d(TAG, "exited USB accessory mode"); Log.d(TAG, "exited USB accessory mode");
if (!UsbManager.setFunctionEnabled
(UsbManager.USB_FUNCTION_ACCESSORY, false)) {
Log.e(TAG, "could not disable accessory function");
}
int count = mDefaultFunctions.size(); int count = mDefaultFunctions.size();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
String function = mDefaultFunctions.get(i); String function = mDefaultFunctions.get(i);
@ -574,8 +577,10 @@ public class UsbService extends IUsbManager.Stub {
} }
} }
mDeviceManager.accessoryDetached(mCurrentAccessory); if (mCurrentAccessory != null) {
mCurrentAccessory = null; mDeviceManager.accessoryDetached(mCurrentAccessory);
mCurrentAccessory = null;
}
} }
} }