Merge "Remove ptp from persist config on boot" into oc-dev (1d1cf130) · Commits · e / os / android_frameworks_base

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -407,13 +407,15 @@ public class UsbDeviceManager {
	UsbManager.USB_FUNCTION_ADB);		UsbManager.USB_FUNCTION_ADB);

	/**		/**
	* Remove MTP from persistent config, to bring usb to a good state		* Previous versions can set persist config to mtp/ptp but it does not
	* after fixes to b/31814300. This block can be removed after the update		* get reset on OTA. Reset the property here instead.
	*/		*/
	String persisted = SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY);		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,		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();		String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();