@@ -220,7 +220,7 @@ async function startAndroidApp(
220220 if ( resolved . type === 'intent' ) {
221221 return await openAndroidIntent ( device , resolved . value , options ) ;
222222 }
223- if ( options . terminateRunningApp ) await stopAndroidPackage ( device , resolved . value , 'relaunch' ) ;
223+ if ( options . terminateRunningApp ) await stopAndroidPackageForRelaunch ( device , resolved . value ) ;
224224 if ( activity ) {
225225 return await openAndroidPackageActivity (
226226 device ,
@@ -357,7 +357,7 @@ async function openAndroidAppBoundDeepLink(
357357 }
358358 await ensureAndroidLocalhostReverse ( device , deepLinkUrl ) ;
359359 const resolved = await requireAndroidPackageForOpen ( device , app , 'app-bound open' ) ;
360- if ( options . terminateRunningApp ) await stopAndroidPackage ( device , resolved , 'relaunch' ) ;
360+ if ( options . terminateRunningApp ) await stopAndroidPackageForRelaunch ( device , resolved ) ;
361361 return await runAndroidShell ( device , [
362362 'am' ,
363363 'start' ,
@@ -616,7 +616,16 @@ export async function openAndroidDevice(device: DeviceInfo): Promise<void> {
616616}
617617
618618export async function closeAndroidApp ( device : DeviceInfo , app : string ) : Promise < void > {
619- await stopAndroidPackage ( device , await resolveAndroidPackageToEnd ( device , app , 'Close' ) , 'close' ) ;
619+ await stopAndroidPackage ( device , await resolveAndroidPackageToEnd ( device , app , 'Close' ) ) ;
620+ }
621+
622+ async function stopAndroidPackageForRelaunch (
623+ device : DeviceInfo ,
624+ packageName : string ,
625+ ) : Promise < void > {
626+ await stopAndroidPackage ( device , packageName ) . catch ( ( error : unknown ) => {
627+ if ( ! passedAndroidRelaunchStopFences ( error ) ) throw error ;
628+ } ) ;
620629}
621630
622631/**
@@ -645,11 +654,7 @@ async function resolveAndroidPackageToEnd(
645654 return resolved . value ;
646655}
647656
648- async function stopAndroidPackage (
649- device : DeviceInfo ,
650- packageName : string ,
651- purpose : 'close' | 'relaunch' ,
652- ) : Promise < void > {
657+ async function stopAndroidPackage ( device : DeviceInfo , packageName : string ) : Promise < void > {
653658 const killed = await readAndroidPackagePids (
654659 device ,
655660 packageName ,
@@ -659,7 +664,7 @@ async function stopAndroidPackage(
659664 throw androidPidofUnavailableError ( packageName ) ;
660665 }
661666 await runAndroidShell ( device , [ 'am' , 'force-stop' , packageName ] ) ;
662- const expired = await waitForAndroidPackageStopped ( device , packageName , killed , purpose ) ;
667+ const expired = await waitForAndroidPackageStopped ( device , packageName , killed ) ;
663668 if ( expired ) throw androidCloseTimeoutError ( packageName , expired ) ;
664669}
665670
@@ -724,12 +729,9 @@ async function waitForAndroidPackageStopped(
724729 device : DeviceInfo ,
725730 packageName : string ,
726731 killed : ReadonlySet < string > ,
727- purpose : 'close' | 'relaunch' ,
728732) : Promise < AndroidStopFencePhase | undefined > {
729733 if ( ! ( await waitForAndroidPackageNotForeground ( device , packageName ) ) ) return 'foreground' ;
730734 if ( ! ( await waitForAndroidKilledProcessesExit ( device , packageName , killed ) ) ) return 'exit' ;
731- // See passedAndroidRelaunchStopFences: a relaunch needs no process fence.
732- if ( purpose === 'relaunch' ) return undefined ;
733735 if ( ! ( await waitForAndroidPackageProcessGone ( device , packageName ) ) ) return 'process' ;
734736 return undefined ;
735737}
0 commit comments