fix(platform-android): reinstall apps on cached emulators

Author: V3RON

packages/platform-android/src/__tests__/adb.test.ts

@@ -12,6 +12,7 @@ import {
   hasAvd,
   installApp,
   startEmulator,
+  uninstallApp,
   waitForBoot,
   waitForEmulatorDisconnect,
 } from '../adb.js';
@@ -146,6 +147,21 @@ describe('getStartAppArgs', () => {
     ]);
   });
 
+  it('uninstalls the app via adb', async () => {
+    const spawnSpy = vi
+      .spyOn(tools, 'spawn')
+      .mockResolvedValueOnce({} as Awaited<ReturnType<typeof tools.spawn>>);
+
+    await uninstallApp('emulator-5554', 'com.example.app');
+
+    expect(spawnSpy).toHaveBeenCalledWith(expect.stringMatching(/adb$/), [
+      '-s',
+      'emulator-5554',
+      'uninstall',
+      'com.example.app',
+    ]);
+  });
+
   it('creates an AVD and appends config overrides', async () => {
     vi.spyOn(avdConfig, 'readAvdConfig').mockResolvedValue({});
     const spawnSpy = vi

packages/platform-android/src/__tests__/instance.test.ts

@@ -429,6 +429,60 @@ describe('Android platform instance', () => {
     fs.rmSync(appPath, { force: true });
   });
 
+  it('reinstalls the app from HARNESS_APP_PATH when already installed', async () => {
+    const appPath = path.join(os.tmpdir(), 'HarnessPlayground-installed.apk');
+    fs.writeFileSync(appPath, 'apk');
+    vi.stubEnv('HARNESS_APP_PATH', appPath);
+    vi.spyOn(
+      await import('../environment.js'),
+      'ensureAndroidEmulatorEnvironment',
+    ).mockResolvedValue('/tmp/android-sdk');
+    vi.spyOn(adb, 'getDeviceIds').mockResolvedValue(['emulator-5554']);
+    vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Pixel_8_API_35');
+    vi.spyOn(adb, 'waitForBoot').mockResolvedValue('emulator-5554');
+    vi.spyOn(adb, 'isAppInstalled').mockResolvedValue(true);
+    const uninstallApp = vi
+      .spyOn(adb, 'uninstallApp')
+      .mockResolvedValue(undefined);
+    const installApp = vi.spyOn(adb, 'installApp').mockResolvedValue(undefined);
+    vi.spyOn(adb, 'reversePort').mockResolvedValue(undefined);
+    vi.spyOn(adb, 'setHideErrorDialogs').mockResolvedValue(undefined);
+    vi.spyOn(adb, 'getAppUid').mockResolvedValue(10234);
+    vi.spyOn(sharedPrefs, 'applyHarnessDebugHttpHost').mockResolvedValue(
+      undefined,
+    );
+
+    await expect(
+      getAndroidEmulatorPlatformInstance(
+        {
+          name: 'android',
+          device: {
+            type: 'emulator',
+            name: 'Pixel_8_API_35',
+            avd: {
+              apiLevel: 35,
+              profile: 'pixel_8',
+              diskSize: '1G',
+              heapSize: '1G',
+            },
+          },
+          bundleId: 'com.harnessplayground',
+          activityName: '.MainActivity',
+        },
+        harnessConfig,
+        init,
+      ),
+    ).resolves.toBeDefined();
+
+    expect(uninstallApp).toHaveBeenCalledWith(
+      'emulator-5554',
+      'com.harnessplayground',
+    );
+    expect(installApp).toHaveBeenCalledWith('emulator-5554', appPath);
+
+    fs.rmSync(appPath, { force: true });
+  });
+
   it('throws a HarnessAppPathError when HARNESS_APP_PATH is missing', async () => {
     vi.spyOn(adb, 'getDeviceIds').mockResolvedValue(['emulator-5554']);
     vi.spyOn(adb, 'getEmulatorName').mockResolvedValue('Pixel_8_API_35');

packages/platform-android/src/adb.ts

@@ -476,6 +476,13 @@ export const installApp = async (
   await spawn(getAdbBinaryPath(), ['-s', adbId, 'install', '-r', appPath]);
 };
 
+export const uninstallApp = async (
+  adbId: string,
+  bundleId: string,
+): Promise<void> => {
+  await spawn(getAdbBinaryPath(), ['-s', adbId, 'uninstall', bundleId]);
+};
+
 export const hasAvd = async (name: string): Promise<boolean> => {
   const avds = await getAvds();
   return avds.includes(name);

packages/platform-android/src/instance.ts

@@ -59,6 +59,20 @@ const getHarnessAppPath = (): string => {
   return appPath;
 };
 
+const getOptionalHarnessAppPath = (): string | undefined => {
+  const appPath = process.env.HARNESS_APP_PATH;
+
+  if (!appPath) {
+    return undefined;
+  }
+
+  if (!fs.existsSync(appPath)) {
+    throw new HarnessAppPathError('invalid', appPath);
+  }
+
+  return appPath;
+};
+
 const configureAndroidRuntime = async (
   adbId: string,
   config: AndroidPlatformConfig,
@@ -251,10 +265,14 @@ export const getAndroidEmulatorPlatformInstance = async (
   );
 
   const isInstalled = await adb.isAppInstalled(adbId, config.bundleId);
+  const appPath = getOptionalHarnessAppPath();
 
-  if (!isInstalled) {
-    const appPath = getHarnessAppPath();
+  if (isInstalled && appPath) {
+    await adb.uninstallApp(adbId, config.bundleId);
     await adb.installApp(adbId, appPath);
+  } else if (!isInstalled) {
+    const installPath = appPath ?? getHarnessAppPath();
+    await adb.installApp(adbId, installPath);
   }
 
   const appUid = await configureAndroidRuntime(adbId, config, harnessConfig);