Merge "usb: Add the boot completed check before broadcasting intent" into tm-dev (acb5ec3d) · Commits · e / os / android_frameworks_base

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -556,6 +556,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		protected boolean mCurrentUsbFunctionsReceived;
		protected int mUsbSpeed;
		protected int mCurrentGadgetHalVersion;
		protected boolean mPendingBootAccessoryHandshakeBroadcast;

		/**
		* The persistent property which stores whether adb is enabled or not.
		@@ -1113,7 +1114,13 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		if (DEBUG) {
		Slog.v(TAG, "Accessory handshake timeout");
		}
		if (mBootCompleted) {
		broadcastUsbAccessoryHandshake();
		} else {
		if (DEBUG) Slog.v(TAG, "Pending broadcasting intent as "
		+ "not boot completed yet.");
		mPendingBootAccessoryHandshakeBroadcast = true;
		}
		break;
		}
		case MSG_INCREASE_SENDSTRING_COUNT: {
		@@ -1137,8 +1144,11 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		if (mCurrentAccessory != null) {
		mUsbDeviceManager.getCurrentSettings().accessoryAttached(mCurrentAccessory);
		broadcastUsbAccessoryHandshake();
		} else if (mPendingBootAccessoryHandshakeBroadcast) {
		broadcastUsbAccessoryHandshake();
		}

		mPendingBootAccessoryHandshakeBroadcast = false;
		updateUsbNotification(false);
		updateAdbNotification(false);
		updateUsbFunctions();