Check and send usb state broadcast when devices boots am: af6d473ab0
am: 061bceafee
Change-Id: Iabb4c7d6c120bb3b45703de084dc52ed958e1dba
This commit is contained in:
committed by
android-build-merger
commit
df1df40f91
@ -150,6 +150,7 @@ public class UsbDeviceManager {
|
|||||||
private UsbDebuggingManager mDebuggingManager;
|
private UsbDebuggingManager mDebuggingManager;
|
||||||
private final UsbAlsaManager mUsbAlsaManager;
|
private final UsbAlsaManager mUsbAlsaManager;
|
||||||
private Intent mBroadcastedIntent;
|
private Intent mBroadcastedIntent;
|
||||||
|
private boolean mPendingBootBroadcast;
|
||||||
|
|
||||||
private class AdbSettingsObserver extends ContentObserver {
|
private class AdbSettingsObserver extends ContentObserver {
|
||||||
public AdbSettingsObserver() {
|
public AdbSettingsObserver() {
|
||||||
@ -748,6 +749,8 @@ public class UsbDeviceManager {
|
|||||||
}
|
}
|
||||||
updateUsbStateBroadcastIfNeeded(false);
|
updateUsbStateBroadcastIfNeeded(false);
|
||||||
updateUsbFunctions();
|
updateUsbFunctions();
|
||||||
|
} else {
|
||||||
|
mPendingBootBroadcast = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MSG_UPDATE_HOST_STATE:
|
case MSG_UPDATE_HOST_STATE:
|
||||||
@ -759,6 +762,8 @@ public class UsbDeviceManager {
|
|||||||
updateUsbNotification();
|
updateUsbNotification();
|
||||||
if (mBootCompleted) {
|
if (mBootCompleted) {
|
||||||
updateUsbStateBroadcastIfNeeded(false);
|
updateUsbStateBroadcastIfNeeded(false);
|
||||||
|
} else {
|
||||||
|
mPendingBootBroadcast = true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MSG_ENABLE_ADB:
|
case MSG_ENABLE_ADB:
|
||||||
@ -778,6 +783,10 @@ public class UsbDeviceManager {
|
|||||||
break;
|
break;
|
||||||
case MSG_BOOT_COMPLETED:
|
case MSG_BOOT_COMPLETED:
|
||||||
mBootCompleted = true;
|
mBootCompleted = true;
|
||||||
|
if (mPendingBootBroadcast) {
|
||||||
|
updateUsbStateBroadcastIfNeeded(false);
|
||||||
|
mPendingBootBroadcast = false;
|
||||||
|
}
|
||||||
setEnabledFunctions(null, false, false);
|
setEnabledFunctions(null, false, false);
|
||||||
if (mCurrentAccessory != null) {
|
if (mCurrentAccessory != null) {
|
||||||
getCurrentSettings().accessoryAttached(mCurrentAccessory);
|
getCurrentSettings().accessoryAttached(mCurrentAccessory);
|
||||||
|
Reference in New Issue
Block a user