fix(android): drop invalid -d display flag from yadb app_process commands (#2718)

Author: quanru

packages/android/src/device.ts

@@ -148,6 +148,17 @@ export class AndroidDevice implements AbstractInterface {
         }
       },
       pinch: async (center, opts) => {
+        // yadb only injects gestures into the default display, so a non-default
+        // display would silently land the pinch on the main screen. Fail fast
+        // instead of misleading the caller.
+        if (
+          typeof this.options?.displayId === 'number' &&
+          this.options.displayId !== 0
+        ) {
+          throw new Error(
+            `Pinch is not supported on a non-default display (displayId=${this.options.displayId}). The underlying yadb tool only injects gestures into the default display.`,
+          );
+        }
         const { x: adjCenterX, y: adjCenterY } = await this.adjustCoordinates(
           Math.round(center.x),
           Math.round(center.y),
@@ -159,7 +170,10 @@ export class AndroidDevice implements AbstractInterface {
         await this.ensureYadb();
         const adb = await this.getAdb();
         await adb.shell(
-          `app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -pinch ${adjCenterX} ${adjCenterY} ${adjStartDist} ${adjEndDist} ${opts.duration}`,
+          // Note: do not append getDisplayArg() here. `app_process` is the ART
+          // runtime launcher and does not accept the `-d <displayId>` flag the
+          // way `input`/`dumpsys` do; passing it makes the VM fail to start.
+          `app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -pinch ${adjCenterX} ${adjCenterY} ${adjStartDist} ${adjEndDist} ${opts.duration}`,
         );
       },
     },
@@ -557,12 +571,14 @@ ${Object.keys(size)
   }
 
   async execYadb(keyboardContent: string): Promise<void> {
+    this.warnYadbOnNonDefaultDisplay('keyboard input');
     await this.ensureYadb();
 
     const adb = await this.getAdb();
 
     await adb.shell(
-      `app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard '${keyboardContent}'`,
+      // `app_process` (ART launcher) does not accept the `-d <displayId>` flag.
+      `app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboard '${keyboardContent}'`,
     );
   }
 
@@ -1196,8 +1212,10 @@ ${Object.keys(size)
       await adb.clearTextField(100);
     } else {
       // Use the yadb tool to clear the input box
+      this.warnYadbOnNonDefaultDisplay('keyboard clear');
       await adb.shell(
-        `app_process${this.getDisplayArg()} -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear`,
+        // `app_process` (ART launcher) does not accept the `-d <displayId>` flag.
+        'app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear',
       );
     }
 
@@ -1892,6 +1910,24 @@ ${Object.keys(size)
       : '';
   }
 
+  /**
+   * yadb (launched via `app_process`) cannot target a specific display and
+   * always acts on the default display. When a non-default display is
+   * configured, warn so the caller knows the operation lands on the main
+   * screen instead of failing silently. Unlike pinch, keyboard operations also
+   * have an `input`-based path, so we warn rather than throw.
+   */
+  private warnYadbOnNonDefaultDisplay(operation: string): void {
+    if (
+      typeof this.options?.displayId === 'number' &&
+      this.options.displayId !== 0
+    ) {
+      warnDevice(
+        `yadb ${operation} cannot target display ${this.options.displayId}; it will act on the default display.`,
+      );
+    }
+  }
+
   async getPhysicalDisplayId(): Promise<string | null> {
     // Return cached value if available
     if (this.cachedPhysicalDisplayId !== undefined) {

packages/android/tests/unit-test/page.test.ts

@@ -2231,6 +2231,70 @@ Stdout:
           expect.stringContaining('input -d 2 swipe'),
         );
       });
+
+      it('should NOT pass the display argument to app_process (yadb) pinch even when displayId is set', async () => {
+        // `app_process` is the ART runtime launcher and does not accept the
+        // `-d <displayId>` flag the way `input`/`dumpsys` do. Passing it makes
+        // the VM fail to start and breaks aiPinch. See getDisplayArg().
+        deviceWithDisplay = new AndroidDevice('test-device', {
+          displayId: 0,
+        });
+
+        setupMockAdb(mockAdbInstance);
+
+        vi.spyOn(deviceWithDisplay, 'getAdb').mockResolvedValue(
+          mockAdbInstance as any,
+        );
+        vi.spyOn(deviceWithDisplay as any, 'ensureYadb').mockResolvedValue(
+          undefined,
+        );
+        (deviceWithDisplay as any).devicePixelRatio = 1;
+
+        await deviceWithDisplay.inputPrimitives.touch.pinch!(
+          { x: 1280, y: 720 },
+          { startDistance: 600, endDistance: 200, duration: 1200 },
+        );
+
+        const pinchCall = mockAdbInstance.shell.mock.calls.find(
+          (call: unknown[]) =>
+            typeof call[0] === 'string' && call[0].includes('-pinch'),
+        );
+        expect(pinchCall).toBeDefined();
+        expect(pinchCall![0]).toContain('app_process -Djava.class.path');
+        expect(pinchCall![0]).not.toContain('app_process -d');
+      });
+
+      it('should throw when pinch is called on a non-default display (displayId > 0)', async () => {
+        // yadb only injects into the default display, so a non-default display
+        // would silently land the pinch on the main screen. Fail fast instead.
+        deviceWithDisplay = new AndroidDevice('test-device', {
+          displayId: 2,
+        });
+
+        setupMockAdb(mockAdbInstance);
+
+        vi.spyOn(deviceWithDisplay, 'getAdb').mockResolvedValue(
+          mockAdbInstance as any,
+        );
+        vi.spyOn(deviceWithDisplay as any, 'ensureYadb').mockResolvedValue(
+          undefined,
+        );
+        (deviceWithDisplay as any).devicePixelRatio = 1;
+
+        await expect(
+          deviceWithDisplay.inputPrimitives.touch.pinch!(
+            { x: 1280, y: 720 },
+            { startDistance: 600, endDistance: 200, duration: 1200 },
+          ),
+        ).rejects.toThrow(/non-default display/);
+
+        // No yadb command should have been issued.
+        const pinchCall = mockAdbInstance.shell.mock.calls.find(
+          (call: unknown[]) =>
+            typeof call[0] === 'string' && call[0].includes('-pinch'),
+        );
+        expect(pinchCall).toBeUndefined();
+      });
     });
 
     it('should not include display argument in shell commands when displayId is not set', async () => {