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

Commit cfa0e727 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce flakes in MediaProjection flicker tests" into main

parents 029eda1c 6bbe3c84

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

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm.flicker.helpers 
import android.app.Instrumentation

import android.tools.device.apphelpers.StandardAppHelper

import android.tools.helpers.SYSTEMUI_PACKAGE

import android.tools.helpers.retryIfStaleObject

import android.tools.traces.component.ComponentNameMatcher

import android.tools.traces.parsers.WindowManagerStateHelper

import android.tools.traces.parsers.toFlickerComponent
@@ -145,11 +146,11 @@ constructor( 
        findObject(By.res(SCREEN_SHARE_OPTIONS_PATTERN)).also { it.click() }



        val singleAppString = getSysUiResourceString(SINGLE_APP_STRING_RES_NAME)

        findObject(By.text(singleAppString)).also { it.click() }

        retryIfStaleObject { findObject(By.text(singleAppString)).also { it.click() } }

    }



    private fun startScreenSharing() {

        findObject(By.res(ACCEPT_RESOURCE_ID)).also { it.click() }

        retryIfStaleObject { findObject(By.res(ACCEPT_RESOURCE_ID)).also { it.click() } }

    }



    private fun findObject(selector: BySelector): UiObject2 =