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

am 0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev

Browse Source 
* commit '0eb10ede2364bf975721d95f7af7a1e4f4b617f8':
  Always set the usb config when modifying it.
This commit is contained in:
Tim Kilbourn
2015-09-19 00:29:35 +00:00
committed by Android Git Automerger
parent 7e765dd7f5 0eb10ede23
commit bdfbd82154
1 changed files with 3 additions and 4 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

@@ -417,10 +417,9 @@ public class UsbDeviceManager {
private boolean setUsbConfig(String config) {
if (DEBUG) Slog.d(TAG, "setUsbConfig(" + config + ")");
// set the new configuration
String oldConfig = SystemProperties.get(USB_CONFIG_PROPERTY);
if (!config.equals(oldConfig)) {
SystemProperties.set(USB_CONFIG_PROPERTY, config);
}
// we always set it due to b/23631400, where adbd was getting killed
// and not restarted due to property timeouts on some devices
SystemProperties.set(USB_CONFIG_PROPERTY, config);
return waitForState(config);
}