Skip to content

Commit 1f6edf6

Browse files
committed
fix(android): keep post-open package inference optional
1 parent 85e9fa2 commit 1f6edf6

2 files changed

Lines changed: 46 additions & 3 deletions

File tree

‎src/__tests__/platform-runtime-android-application-tools.test.ts‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
import { describe, expect, test, vi } from 'vitest';
1+
import { afterEach, describe, expect, test, vi } from 'vitest';
22
import { AppError } from '@agent-device/kernel/errors';
33
import type { DeviceInfo } from '@agent-device/kernel/device';
44
import { createAndroidApplicationTools } from '../platform-runtime-android-application-tools.ts';
5+
import * as androidMechanics from '../platform-runtime-android-mechanics.ts';
56

67
const activateAndroidTestIme = vi.hoisted(() => vi.fn());
78
const restoreAndroidTestIme = vi.hoisted(() => vi.fn());
89

910
vi.mock('@agent-device/platform-android/mechanics', () => ({
1011
activateAndroidTestIme,
1112
restoreAndroidTestIme,
13+
inferAndroidPackageAfterOpen: async () => 'com.example.foreground',
1214
listAndroidAdbSerialsQuick: async () => [],
1315
restoreOrphanedAndroidTestImeOnDaemonStartup: async () => undefined,
1416
}));
@@ -27,6 +29,42 @@ const settled = {
2729
helperPackageName: 'pkg',
2830
};
2931

32+
describe('android application tools: optional opened package inference', () => {
33+
afterEach(() => vi.restoreAllMocks());
34+
35+
test.each([
36+
['a targetless fresh open', undefined, undefined],
37+
['a targetless open with an existing identity', undefined, 'com.example.app'],
38+
['a deep link with an existing identity', 'example://home', 'com.example.app'],
39+
])('%s needs no Android mechanics', async (_name, target, currentAppBundleId) => {
40+
const load = vi
41+
.spyOn(androidMechanics, 'loadAndroidMechanics')
42+
.mockRejectedValue(new Error('Android mechanics unavailable'));
43+
44+
await expect(
45+
createAndroidApplicationTools().inferOpenedAppBundleId(device, target, currentAppBundleId),
46+
).resolves.toBe(currentAppBundleId);
47+
expect(load).not.toHaveBeenCalled();
48+
});
49+
50+
test('a deep link leaves its package identity unset if Android mechanics cannot load', async () => {
51+
const load = vi
52+
.spyOn(androidMechanics, 'loadAndroidMechanics')
53+
.mockRejectedValue(new Error('Android mechanics unavailable'));
54+
55+
await expect(
56+
createAndroidApplicationTools().inferOpenedAppBundleId(device, 'example://home', undefined),
57+
).resolves.toBeUndefined();
58+
expect(load).toHaveBeenCalledOnce();
59+
});
60+
61+
test('a deep link adopts the inferred foreground package when mechanics are available', async () => {
62+
await expect(
63+
createAndroidApplicationTools().inferOpenedAppBundleId(device, 'example://home', undefined),
64+
).resolves.toBe('com.example.foreground');
65+
});
66+
});
67+
3068
describe('android application tools: test IME activation policy', () => {
3169
// Test IME is default-on for emulators, so an unobtainable helper must not fail the open.
3270
test('an unobtainable helper warns and leaves the open successful', async () => {

‎src/platform-runtime-android-application-tools.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ export function createAndroidApplicationTools(): AndroidApplicationTools {
2323
return Object.freeze({
2424
resolveOpenTarget: async (device, input) => await resolveAndroidOpenTarget(device, input),
2525
inferOpenedAppBundleId: async (device, target, currentAppBundleId) => {
26-
const { inferAndroidPackageAfterOpen } = await loadAndroidMechanics();
27-
return await inferAndroidPackageAfterOpen(device, target, currentAppBundleId);
26+
if (currentAppBundleId || !target) return currentAppBundleId;
27+
try {
28+
const { inferAndroidPackageAfterOpen } = await loadAndroidMechanics();
29+
return await inferAndroidPackageAfterOpen(device, target, currentAppBundleId);
30+
} catch {
31+
return currentAppBundleId;
32+
}
2833
},
2934
resetFramePerfStats: async (device, appBundleId) => {
3035
const { resetAndroidFramePerfStats } = await loadAndroidMechanics();

0 commit comments

Comments
 (0)