Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UsbService: Make USB disconnect handling for accessory mode more robust

Browse Source 
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level.  On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.

Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2011-03-29 16:49:42 -07:00
parent 7661dd8de1
commit 4f0f3561ed
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:
if (mConnected != mLastConnected || mConfiguration != mLastConfiguration) {
if (mConnected == 0) {
// make sure accessory mode is off, and restore default functions
if (mCurrentAccessory != null && UsbManager.setFunctionEnabled(
UsbManager.USB_FUNCTION_ACCESSORY, false)) {
if (UsbManager.isFunctionEnabled(
UsbManager.USB_FUNCTION_ACCESSORY)) {
// make sure accessory mode is off, and restore default functions
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();
for (int i = 0; i < count; i++) {
String function = mDefaultFunctions.get(i);
@@ -574,8 +577,10 @@ public class UsbService extends IUsbManager.Stub {
}
}
mDeviceManager.accessoryDetached(mCurrentAccessory);
mCurrentAccessory = null;
if (mCurrentAccessory != null) {
mDeviceManager.accessoryDetached(mCurrentAccessory);
mCurrentAccessory = null;
}
}
}