Merge changes from topic 'am-7c11f830c3cc4f4994e740cad00a8e97' (a0325c85) · Commits · e / os / android_frameworks_base

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ public class UsbDeviceManager {
		private final UsbAlsaManager mUsbAlsaManager;
		private final UsbSettingsManager mSettingsManager;
		private Intent mBroadcastedIntent;
		private boolean mPendingBootBroadcast;

		private class AdbSettingsObserver extends ContentObserver {
		public AdbSettingsObserver() {
		@@ -755,13 +756,16 @@ public class UsbDeviceManager {
		if (UsbManager.containsFunction(mCurrentFunctions,
		UsbManager.USB_FUNCTION_ACCESSORY)) {
		updateCurrentAccessory();
		} else if (!mConnected) {
		}
		if (mBootCompleted) {
		if (!mConnected) {
		// restore defaults when USB is disconnected
		setEnabledFunctions(null, false, false);
		}
		if (mBootCompleted) {
		updateUsbStateBroadcastIfNeeded(false);
		updateUsbFunctions();
		} else {
		mPendingBootBroadcast = true;
		}
		break;
		case MSG_UPDATE_HOST_STATE:
		@@ -773,6 +777,8 @@ public class UsbDeviceManager {
		updateUsbNotification();
		if (mBootCompleted) {
		updateUsbStateBroadcastIfNeeded(false);
		} else {
		mPendingBootBroadcast = true;
		}
		break;
		case MSG_ENABLE_ADB:
		@@ -792,6 +798,10 @@ public class UsbDeviceManager {
		break;
		case MSG_BOOT_COMPLETED:
		mBootCompleted = true;
		if (mPendingBootBroadcast) {
		updateUsbStateBroadcastIfNeeded(false);
		mPendingBootBroadcast = false;
		}
		setEnabledFunctions(null, false, false);
		if (mCurrentAccessory != null) {
		getCurrentSettings().accessoryAttached(mCurrentAccessory);