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

Merge changes from topic 'am-7c11f830c3cc4f4994e740cad00a8e97'

Browse Source 
* changes:
  Check and send usb state broadcast when devices boots am: af6d473ab0 am: 061bceafee am: df1df40f91 am: 307a387f38
  Only send usb disconnect intents after boot. am: c1bc0a844d am: dc9c094deb am: 9877c70d9d am: 1064ee66d5
This commit is contained in:
Android Build Merger (Role)
2017-01-31 01:15:24 +00:00
committed by Android (Google) Code Review
parent efdc663569 26b6130282
commit a0325c8513
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
}
if (mBootCompleted) {
if (!mConnected) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
}
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);