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

Commit 217c8cb4 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Disable assertion check for SimpleActivity and fix linter

SimpleActivity can be visible for a single frame when the device janks

Fixes: 309816942
Test: atest CloseImeToHomeOnFinishActivityTest
Change-Id: I567500505ea0866d6dc59893588e3f918b10d70b
parent 9c08fe6a
Loading
Loading
Loading
Loading
+13 −6
Original line number Diff line number Diff line
@@ -19,12 +19,12 @@ package com.android.server.wm.flicker.ime
import android.platform.test.annotations.PlatinumTest
import android.platform.test.annotations.Presubmit
import android.tools.common.Rotation
import android.tools.common.flicker.subject.layers.LayersTraceSubject.Companion.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
import android.tools.device.flicker.legacy.FlickerBuilder
import android.tools.device.flicker.legacy.LegacyFlickerTest
import android.tools.device.flicker.legacy.LegacyFlickerTestFactory
import android.tools.device.traces.parsers.toFlickerComponent
import androidx.test.filters.FlakyTest
import com.android.server.wm.flicker.BaseTest
import com.android.server.wm.flicker.helpers.ImeAppHelper
import com.android.server.wm.flicker.helpers.SimpleAppHelper
@@ -58,7 +58,8 @@ class CloseImeToHomeOnFinishActivityTest(flicker: LegacyFlickerTest) : BaseTest(
        }
        transitions {
            broadcastActionTrigger.doAction(ACTION_FINISH_ACTIVITY)
            wmHelper.StateSyncBuilder()
            wmHelper
                .StateSyncBuilder()
                .withActivityRemoved(ActivityOptions.Ime.Default.COMPONENT.toFlickerComponent())
                .waitForAndVerify()
        }
@@ -69,10 +70,16 @@ class CloseImeToHomeOnFinishActivityTest(flicker: LegacyFlickerTest) : BaseTest(

    @Presubmit @Test fun imeLayerBecomesInvisible() = flicker.imeLayerBecomesInvisible()

    @FlakyTest(bugId = 246284124)
    @Presubmit
    @Test
    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
        super.visibleLayersShownMoreThanOneConsecutiveEntry()
        flicker.assertLayers {
            this.visibleLayersShownMoreThanOneConsecutiveEntry(
                VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS.toMutableList().also {
                    it.add(simpleApp.componentMatcher)
                }
            )
        }
    }

    @Presubmit