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

Commit e64eed7d authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Waiting for test activity to be removed 

This is similar to commit c5482b12. Which avoids concurrent issue
of mocked object of next test.

Fix: 325281053
Test: atest TrustedOverlayTests UnknownAppVisibilityControllerTest
Change-Id: Ic50753840685644e4900260fb90421cf2fb19f9d
parent ce8d4a38

services/tests/wmtests/src/com/android/server/wm/TrustedOverlayTests.java

+7 −0
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ import android.view.WindowManager; 
import androidx.test.ext.junit.rules.ActivityScenarioRule;

import androidx.test.platform.app.InstrumentationRegistry;



import com.android.server.wm.utils.CommonUtils;

import com.android.window.flags.Flags;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -77,6 +79,11 @@ public class TrustedOverlayTests { 
        });

    }



    @After

    public void tearDown() {

        CommonUtils.waitUntilActivityRemoved(mActivity);

    }



    @RequiresFlagsDisabled(Flags.FLAG_SURFACE_TRUSTED_OVERLAY)

    @Test

    public void setTrustedOverlayInputWindow() throws InterruptedException {