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

Commit 449e5896 authored by YoungJoon Yang's avatar YoungJoon Yang Committed by Android (Google) Code Review
Browse files

Merge "Do nothing to show EmulatorDisplayOveraly for WmTests" into main

parents 06f3cfc5 1df07ab6

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

+0 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm; 


import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.clearInvocations;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;
@@ -70,7 +69,6 @@ public class EmulatorDisplayOverlayTests extends WindowTestsBase { 


    @Test

    public void testShowEmulatorDisplayOverlay() {

        doNothing().when(mWm).showEmulatorDisplayOverlay();

        clearInvocations(mWm);



        testShowEmulatorDisplayOverlay(

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

+3 −0
Original line number Diff line number Diff line
@@ -411,6 +411,9 @@ public class SystemServicesTestRule implements TestRule { 
                mTransaction, new MockSurfaceControlBuilder(), mAppCompat);



        spyOn(mWmService);

        // Do nothing to show EmulatorDisplayOverlay

        doNothing().when(mWmService).showEmulatorDisplayOverlay();



        spyOn(mWmService.mRoot);

        // Invoked during {@link ActivityStack} creation.

        doNothing().when(mWmService.mRoot).updateUIDsPresentOnDisplay();