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

Commit c84b4d7f authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am e920322f: am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert... 

am e920322f: am 86119603: am aa7e396f: am 935d417b: am afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev

* commit 'e920322f':
  Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
parents 6890727c e920322f

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

+2 −25
Original line number Diff line number Diff line
@@ -90,7 +90,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;
@@ -153,7 +152,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();

            }

        }

    };
@@ -171,7 +170,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);
@@ -233,8 +232,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);
@@ -309,7 +306,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;
@@ -616,11 +612,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,
@@ -634,10 +625,6 @@ public class UsbDeviceManager { 
                        updateUsbState();

                        updateAudioSourceFunction();

                    }

                    if (mConnected && mConfigured && mAccessoryStartPending) {

                        startAccessoryMode();

                        mAccessoryStartPending = false;

                    }

                    break;

                case MSG_ENABLE_ADB:

                    setAdbEnabled(msg.arg1 == 1);
@@ -674,16 +661,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;

            }

        }