drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only send usb disconnect intents after boot. am: c1bc0a844d am: dc9c094deb

Browse Source 
am: 9877c70d9d

Change-Id: I515745dd4f30a979fffcb6c9eea8a38e1bef11ca
This commit is contained in:
Jerry Zhang
2017-01-31 01:06:45 +00:00
committed by android-build-merger
parent bb44e42de9 9877c70d9d
commit 1064ee66d5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -740,11 +740,12 @@ public class UsbDeviceManager {
if (UsbManager.containsFunction(mCurrentFunctions, if (UsbManager.containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_ACCESSORY)) { UsbManager.USB_FUNCTION_ACCESSORY)) {
updateCurrentAccessory(); updateCurrentAccessory();
} else if (!mConnected) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
} }
if (mBootCompleted) { if (mBootCompleted) {
if (!mConnected) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
}
updateUsbStateBroadcastIfNeeded(false); updateUsbStateBroadcastIfNeeded(false);
updateUsbFunctions(); updateUsbFunctions();
} }