Merge "Avoid removing USB state changes during CONFIGURED uevent" am: 6b8b9efad1 am: da70fd1af3 am: a87ed3d36b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1898830

Change-Id: I82b80ef0e935f8cafba2d3b9ec527b55cbde8e5a
This commit is contained in:
Treehugger Robot
2022-03-07 18:21:50 +00:00
committed by Automerger Merge Worker

View File

@@ -640,7 +640,7 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
Slog.e(TAG, "unknown state " + state);
return;
}
removeMessages(MSG_UPDATE_STATE);
if (configured == 0) removeMessages(MSG_UPDATE_STATE);
if (connected == 1) removeMessages(MSG_FUNCTION_SWITCH_TIMEOUT);
Message msg = Message.obtain(this, MSG_UPDATE_STATE);
msg.arg1 = connected;