Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4d3bc3 authored by Saho Kobayashi's avatar Saho Kobayashi
Browse files

Allow passing ActivityOptions to launchViaIntent helper function 

launchViaIntent function doesn't accept ActivityOptions, but
ActivityOpstions is necessary to specify Display related options on the
test app launch including launch display ID.

Bug: 418669322
Test: m
Flag: TEST_ONLY
Change-Id: I5fd6c0a04cd371c8728ebc9fbae2738f3a255352
parent e1141275

tests/FlickerTests/test-apps/app-helpers/src/com/android/server/wm/flicker/helpers/ImeShownOnAppStartHelper.kt

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.wm.flicker.helpers



import android.app.ActivityOptions as ActivityOptionsForIntent

import android.app.Instrumentation

import android.tools.Rotation

import android.tools.helpers.FIND_TIMEOUT
@@ -52,14 +53,16 @@ constructor( 
        launchedAppComponentMatcherOverride: IComponentMatcher?,

        action: String?,

        stringExtras: Map<String, String>,

        waitConditionsBuilder: WindowManagerStateHelper.StateSyncBuilder

        waitConditionsBuilder: WindowManagerStateHelper.StateSyncBuilder,

        options: ActivityOptionsForIntent?,

    ) {

        super.launchViaIntent(

            wmHelper,

            launchedAppComponentMatcherOverride,

            action,

            stringExtras,

            waitConditionsBuilder

            waitConditionsBuilder,

            options,

        )

        waitIMEShown(wmHelper)

    }