Merge "Set no data transfer on function switch timeout for accessory mode" into tm-dev (9ad82d42) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -735,7 +735,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		}
		}

		private void notifyAccessoryModeExit() {
		protected void notifyAccessoryModeExit() {
		// make sure accessory mode is off
		// and restore default functions
		Slog.d(TAG, "exited USB accessory mode");
		@@ -1981,9 +1981,14 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
		* Dont force to default when the configuration is already set to default.
		*/
		if (msg.arg1 != 1) {
		// Set this since default function may be selected from Developer options
		if (mCurrentFunctions == UsbManager.FUNCTION_ACCESSORY) {
		notifyAccessoryModeExit();
		} else {
		// Set this since default function may be selected from Developer
		// options
		setEnabledFunctions(mScreenUnlockedFunctions, false);
		}
		}
		break;
		case MSG_GADGET_HAL_REGISTERED:
		boolean preexisting = msg.arg1 == 1;