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

Commit a8731e1e authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory... 

Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
parents cafbe87d 8f2e3862

services/java/com/android/server/usb/UsbService.java

+11 −6
Original line number Diff line number Diff line
@@ -387,11 +387,14 @@ public class UsbService extends IUsbManager.Stub { 
                    case MSG_UPDATE_STATE:

                        if (mConnected != mLastConnected || mConfiguration != mLastConfiguration) {

                            if (mConnected == 0) {

                                if (UsbManager.isFunctionEnabled(

                                            UsbManager.USB_FUNCTION_ACCESSORY)) {

                                    // make sure accessory mode is off, and restore default functions

                                if (mCurrentAccessory != null && UsbManager.setFunctionEnabled(

                                        UsbManager.USB_FUNCTION_ACCESSORY, false)) {

                                    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);
@@ -400,10 +403,12 @@ public class UsbService extends IUsbManager.Stub { 
                                        }

                                    }



                                    if (mCurrentAccessory != null) {

                                        mDeviceManager.accessoryDetached(mCurrentAccessory);

                                        mCurrentAccessory = null;

                                    }

                                }

                            }



                            final ContentResolver cr = mContext.getContentResolver();

                            if (Settings.Secure.getInt(cr,