Set no data transfer on function switch timeout for accessory mode

In case of function switch times out, we will check whether the last function set was accessory. If this is the case, it is recommended to set the function to NONE(No data transfer) rather than setting it to the default USB function. Bug: 353712853 Test: Build the code, flash the device and test it. Test: atest CtsUsbManagerTestCases Test: run CtsVerifier tool Test: atest CtsUsbTests (cherry picked from commit 7c6ec68537ba8abf798afd9ab7c3e5889841171f) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3c16bf88ed7896af98f669246c21b17f1018068b) Merged-In: I698e9df0333cbb51dd9bd5917a94d81273a2784a Change-Id: I698e9df0333cbb51dd9bd5917a94d81273a2784a
AICP · Nov 18, 2024 · 851fc47 · 851fc47
1 parent 8648665
commit 851fc47
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -753,7 +753,7 @@ private void updateCurrentAccessory() {
             }
         }
 
-        private void notifyAccessoryModeExit() {
+        protected void notifyAccessoryModeExit() {
             // make sure accessory mode is off
             // and restore default functions
             Slog.d(TAG, "exited USB accessory mode");
@@ -2002,8 +2002,13 @@ public void handleMessage(Message msg) {
                      * 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
-                        setEnabledFunctions(mScreenUnlockedFunctions, false);
+                        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: