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

Merge "usb: Add the boot completed check before broadcasting intent" into tm-dev am: acb5ec3db7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17809206

Change-Id: I7c0aa48e1a2ad0aa78f21df08cd95605c66400ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-22 06:35:30 +00:00
committed by Automerger Merge Worker
parent a8674bd566 acb5ec3db7
commit 41a80d5e97
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -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");
}
broadcastUsbAccessoryHandshake();
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();