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

Merge "Remove ptp from persist config on boot" into oc-dev

Browse Source 
am: 1d1cf13056

Change-Id: I6c9afcc05fa88bbbbe63ddd3ab948e887c350505
This commit is contained in:
Jerry Zhang
2017-06-05 18:45:09 +00:00
committed by android-build-merger
parent 54376bbd4b 1d1cf13056
commit 8d5570b9e1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -407,13 +407,15 @@ public class UsbDeviceManager {
UsbManager.USB_FUNCTION_ADB);
/**
* Remove MTP from persistent config, to bring usb to a good state
* after fixes to b/31814300. This block can be removed after the update
* Previous versions can set persist config to mtp/ptp but it does not
* get reset on OTA. Reset the property here instead.
*/
String persisted = SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY);
if (UsbManager.containsFunction(persisted, UsbManager.USB_FUNCTION_MTP)) {
if (UsbManager.containsFunction(persisted, UsbManager.USB_FUNCTION_MTP)
|| UsbManager.containsFunction(persisted, UsbManager.USB_FUNCTION_PTP)) {
SystemProperties.set(USB_PERSISTENT_CONFIG_PROPERTY,
UsbManager.removeFunction(persisted, UsbManager.USB_FUNCTION_MTP));
UsbManager.removeFunction(UsbManager.removeFunction(persisted,
UsbManager.USB_FUNCTION_MTP), UsbManager.USB_FUNCTION_PTP));
}
String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();