Merge "USB: Don't add adb function when usb disconnected" (807c8067) · Commits · e / os / android_frameworks_base

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -461,7 +461,7 @@ public class UsbDeviceManager {
		// with OEM specific mode.
		if (functions != null && makeDefault && !needsOemUsbOverride()) {

		if (!"charging".equals(functions)) {
		if (!UsbManager.USB_FUNCTION_CHARGING.equals(functions)) {
		if (mAdbEnabled) {
		functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);
		} else {
		@@ -495,11 +495,13 @@ public class UsbDeviceManager {
		// Override with bootmode specific usb mode if needed
		functions = processOemUsbOverride(functions);

		if (!UsbManager.USB_FUNCTION_CHARGING.equals(functions)) {
		if (mAdbEnabled) {
		functions = addFunction(functions, UsbManager.USB_FUNCTION_ADB);
		} else {
		functions = removeFunction(functions, UsbManager.USB_FUNCTION_ADB);
		}
		}
		if (!mCurrentFunctions.equals(functions)) {
		if (!setUsbConfig("none")) {
		Slog.e(TAG, "Failed to disable USB");