fix: use grouped permission listing for adb grants

Author: V3RON

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

@@ -596,20 +596,54 @@ describe('getStartAppArgs', () => {
     expect(spawnSpy).toHaveBeenCalledTimes(2);
   });
 
-  it('grants permissions to an app', async () => {
+  it('grants requested dangerous permissions to an app', async () => {
     const { grantPermissions } = await import('../adb.js');
-    const spawnSpy = vi.spyOn(tools, 'spawn');
-    spawnSpy.mockResolvedValue({
-      stdout: '',
-    } as Awaited<ReturnType<typeof tools.spawn>>);
+    const spawnSpy = vi
+      .spyOn(tools, 'spawn')
+      .mockResolvedValueOnce({
+        stdout: 'package:com.example.app\n',
+      } as Awaited<ReturnType<typeof tools.spawn>>)
+      .mockResolvedValueOnce({
+        stdout: `requested permissions:\n  android.permission.CAMERA\n  android.permission.INTERNET\n  android.permission.ACCESS_FINE_LOCATION\ninstall permissions:\n`,
+      } as Awaited<ReturnType<typeof tools.spawn>>)
+      .mockResolvedValueOnce({
+        stdout: `Dangerous Permissions:\n  permission:android.permission.CAMERA\n  permission:android.permission.ACCESS_FINE_LOCATION\n`,
+      } as Awaited<ReturnType<typeof tools.spawn>>)
+      .mockResolvedValue({
+        stdout: '',
+      } as Awaited<ReturnType<typeof tools.spawn>>);
 
-    await grantPermissions('emulator-5554', 'com.example.app', [
-      'android.permission.CAMERA',
-      'android.permission.RECORD_AUDIO',
-    ]);
+    await grantPermissions('emulator-5554', 'com.example.app');
 
-    expect(spawnSpy).toHaveBeenCalledTimes(2);
+    expect(spawnSpy).toHaveBeenCalledTimes(5);
     expect(spawnSpy).toHaveBeenNthCalledWith(1, expect.any(String), [
+      '-s',
+      'emulator-5554',
+      'shell',
+      'pm',
+      'list',
+      'packages',
+      'com.example.app',
+    ]);
+    expect(spawnSpy).toHaveBeenNthCalledWith(2, expect.any(String), [
+      '-s',
+      'emulator-5554',
+      'shell',
+      'dumpsys',
+      'package',
+      'com.example.app',
+    ]);
+    expect(spawnSpy).toHaveBeenNthCalledWith(3, expect.any(String), [
+      '-s',
+      'emulator-5554',
+      'shell',
+      'pm',
+      'list',
+      'permissions',
+      '-g',
+      '-d',
+    ]);
+    expect(spawnSpy).toHaveBeenNthCalledWith(4, expect.any(String), [
       '-s',
       'emulator-5554',
       'shell',
@@ -618,23 +652,33 @@ describe('getStartAppArgs', () => {
       'com.example.app',
       'android.permission.CAMERA',
     ]);
-    expect(spawnSpy).toHaveBeenNthCalledWith(2, expect.any(String), [
+    expect(spawnSpy).toHaveBeenNthCalledWith(5, expect.any(String), [
       '-s',
       'emulator-5554',
       'shell',
       'pm',
       'grant',
       'com.example.app',
-      'android.permission.RECORD_AUDIO',
+      'android.permission.ACCESS_FINE_LOCATION',
     ]);
   });
 
-  it('handles empty permission list when granting permissions', async () => {
+  it('does nothing when the app has no grantable dangerous permissions', async () => {
     const { grantPermissions } = await import('../adb.js');
-    const spawnSpy = vi.spyOn(tools, 'spawn');
+    const spawnSpy = vi
+      .spyOn(tools, 'spawn')
+      .mockResolvedValueOnce({
+        stdout: 'package:com.example.app\n',
+      } as Awaited<ReturnType<typeof tools.spawn>>)
+      .mockResolvedValueOnce({
+        stdout: `requested permissions:\n  android.permission.INTERNET\ninstall permissions:\n`,
+      } as Awaited<ReturnType<typeof tools.spawn>>)
+      .mockResolvedValueOnce({
+        stdout: `Dangerous Permissions:\n  permission:android.permission.CAMERA\n`,
+      } as Awaited<ReturnType<typeof tools.spawn>>);
 
-    await grantPermissions('emulator-5554', 'com.example.app', []);
+    await grantPermissions('emulator-5554', 'com.example.app');
 
-    expect(spawnSpy).not.toHaveBeenCalled();
+    expect(spawnSpy).toHaveBeenCalledTimes(3);
   });
 });

packages/platform-android/src/adb.ts

@@ -378,6 +378,79 @@ export const getDeviceInfo = async (
   return { manufacturer, model };
 };
 
+const getRequestedPermissions = async (
+  adbId: string,
+  bundleId: string,
+): Promise<string[]> => {
+  const { stdout } = await spawn(getAdbBinaryPath(), [
+    '-s',
+    adbId,
+    'shell',
+    'dumpsys',
+    'package',
+    bundleId,
+  ]);
+
+  const requestedPermissions = new Set<string>();
+  const lines = stdout.split('\n');
+  let inRequestedPermissionsSection = false;
+
+  for (const line of lines) {
+    const trimmedLine = line.trim();
+
+    if (trimmedLine === 'requested permissions:') {
+      inRequestedPermissionsSection = true;
+      continue;
+    }
+
+    if (!inRequestedPermissionsSection) {
+      continue;
+    }
+
+    if (trimmedLine === '') {
+      continue;
+    }
+
+    if (trimmedLine.endsWith(':')) {
+      break;
+    }
+
+    if (/^[a-zA-Z0-9_.]+$/.test(trimmedLine)) {
+      requestedPermissions.add(trimmedLine);
+      continue;
+    }
+
+    break;
+  }
+
+  return [...requestedPermissions];
+};
+
+const getDangerousPermissions = async (adbId: string): Promise<Set<string>> => {
+  const { stdout } = await spawn(getAdbBinaryPath(), [
+    '-s',
+    adbId,
+    'shell',
+    'pm',
+    'list',
+    'permissions',
+    '-g',
+    '-d',
+  ]);
+
+  const dangerousPermissions = new Set<string>();
+
+  for (const match of stdout.matchAll(/permission:([a-zA-Z0-9_.]+)/g)) {
+    const permission = match[1]?.trim();
+
+    if (permission) {
+      dangerousPermissions.add(permission);
+    }
+  }
+
+  return dangerousPermissions;
+};
+
 export const isBootCompleted = async (adbId: string): Promise<boolean> => {
   try {
     const bootCompleted = await getShellProperty(adbId, 'sys.boot_completed');
@@ -738,17 +811,24 @@ export const getConnectedDevices = async (): Promise<AdbDevice[]> => {
 export const grantPermissions = async (
   adbId: string,
   bundleId: string,
-  permissions: string[],
 ): Promise<void> => {
-  if (permissions.length === 0) {
-    return;
-  }
-
   const isInstalled = await isAppInstalled(adbId, bundleId);
   if (!isInstalled) {
     throw new AdbAppNotInstalledError(bundleId, adbId);
   }
 
+  const [requestedPermissions, dangerousPermissions] = await Promise.all([
+    getRequestedPermissions(adbId, bundleId),
+    getDangerousPermissions(adbId),
+  ]);
+  const permissions = requestedPermissions.filter((permission) =>
+    dangerousPermissions.has(permission),
+  );
+
+  if (permissions.length === 0) {
+    return;
+  }
+
   const grantCommands = permissions.map((permission) => [
     '-s',
     adbId,