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

Commit aaa5aeed authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Fix broken tests for PWM 

Previous CL ag/25115103 fixed flakiness in PWM but caused other tests to
break. This CL fixes the tests.

Test: atest WmTests
Bug: 306757510
Bug: 306757392
Change-Id: I06844395f5cfb70e4fb569479a97671775e06970
parent c870ab2d

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -2478,7 +2478,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                com.android.internal.R.integer.config_keyguardDrawnTimeout);

        mKeyguardDelegate = injector.getKeyguardServiceDelegate();

        initKeyCombinationRules();

        initSingleKeyGestureRules();

        initSingleKeyGestureRules(injector.getLooper());

        mSideFpsEventHandler = new SideFpsEventHandler(mContext, mHandler, mPowerManager);

    }
@@ -2749,8 +2749,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    private void initSingleKeyGestureRules() {

        mSingleKeyGestureDetector = SingleKeyGestureDetector.get(mContext);

    private void initSingleKeyGestureRules(Looper looper) {

        mSingleKeyGestureDetector = SingleKeyGestureDetector.get(mContext, looper);

        mSingleKeyGestureDetector.addRule(new PowerKeyRule());

        if (hasLongPressOnBackBehavior()) {

            mSingleKeyGestureDetector.addRule(new BackKeyRule());

services/core/java/com/android/server/policy/SingleKeyGestureDetector.java

+6 −6
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ public final class SingleKeyGestureDetector { 
        }

    }



    static SingleKeyGestureDetector get(Context context) {

        SingleKeyGestureDetector detector = new SingleKeyGestureDetector();

    static SingleKeyGestureDetector get(Context context, Looper looper) {

        SingleKeyGestureDetector detector = new SingleKeyGestureDetector(looper);

        sDefaultLongPressTimeout = context.getResources().getInteger(

                com.android.internal.R.integer.config_globalActionsKeyTimeout);

        sDefaultVeryLongPressTimeout = context.getResources().getInteger(
@@ -180,8 +180,8 @@ public final class SingleKeyGestureDetector { 
        return detector;

    }



    private SingleKeyGestureDetector() {

        mHandler = new KeyHandler();

    private SingleKeyGestureDetector(Looper looper) {

        mHandler = new KeyHandler(looper);

    }



    void addRule(SingleKeyRule rule) {
@@ -402,8 +402,8 @@ public final class SingleKeyGestureDetector { 
    }



    private class KeyHandler extends Handler {

        KeyHandler() {

            super(Looper.myLooper());

        KeyHandler(Looper looper) {

            super(looper);

        }



        @Override

services/tests/wmtests/src/com/android/server/policy/ShortcutKeyTestBase.java

+1 −0
Original line number Diff line number Diff line
@@ -203,5 +203,6 @@ class ShortcutKeyTestBase { 
                mPhoneWindowManager.dispatchUnhandledKey(keyEvent);

            }

        }

        mPhoneWindowManager.dispatchAllPendingEvents();

    }

}

services/tests/wmtests/src/com/android/server/policy/SingleKeyGestureTests.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import static org.junit.Assert.assertTrue; 


import android.app.Instrumentation;

import android.content.Context;

import android.os.Looper;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Process;
@@ -76,7 +77,7 @@ public class SingleKeyGestureTests { 
    public void setUp() {

        mInstrumentation.runOnMainSync(

                () -> {

                    mDetector = SingleKeyGestureDetector.get(mContext);

                    mDetector = SingleKeyGestureDetector.get(mContext, Looper.myLooper());

                    initSingleKeyGestureRules();

                });

services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java

+14 −17
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ import org.mockito.quality.Strictness; 
import java.util.function.Supplier;



class TestPhoneWindowManager {

    private static final long SHORTCUT_KEY_DELAY_MILLIS = 150;

    private static final long TEST_SINGLE_KEY_DELAY_MILLIS

            = SingleKeyGestureDetector.MULTI_PRESS_TIMEOUT + 1000L * HW_TIMEOUT_MULTIPLIER;
@@ -188,7 +187,7 @@ class TestPhoneWindowManager { 
        MockitoAnnotations.initMocks(this);

        mHandler = new Handler(mTestLooper.getLooper());

        mContext = mockingDetails(context).isSpy() ? context : spy(context);

        mHandler.post(() -> setUp(supportSettingsUpdate));

        setUp(supportSettingsUpdate);

        mTestLooper.dispatchAll();

    }
@@ -306,6 +305,10 @@ class TestPhoneWindowManager { 
        mMockitoSession.finishMocking();

    }



    void dispatchAllPendingEvents() {

        mTestLooper.dispatchAll();

    }



    // Override accessibility setting and perform function.

    private void overrideLaunchAccessibility() {

        doReturn(true).when(mAccessibilityShortcutController)
@@ -446,6 +449,7 @@ class TestPhoneWindowManager { 
        doNothing().when(mPhoneWindowManager).sendCloseSystemWindows();

        doReturn(true).when(mPhoneWindowManager).isUserSetupComplete();

        doReturn(mContext).when(mContext).createContextAsUser(any(), anyInt());

        doReturn(mSearchManager).when(mContext).getSystemService(eq(SearchManager.class));

    }



    void overrideSearchManager(SearchManager searchManager) {
@@ -500,29 +504,24 @@ class TestPhoneWindowManager { 
     */

    void assertTakeScreenshotCalled() {

        mTestLooper.dispatchAll();

        verify(mDisplayPolicy, timeout(SHORTCUT_KEY_DELAY_MILLIS))

                .takeScreenshot(anyInt(), anyInt());

        verify(mDisplayPolicy).takeScreenshot(anyInt(), anyInt());

    }



    void assertShowGlobalActionsCalled() {

        mTestLooper.dispatchAll();

        verify(mPhoneWindowManager).showGlobalActions();

        verify(mGlobalActions, timeout(SHORTCUT_KEY_DELAY_MILLIS))

                .showDialog(anyBoolean(), anyBoolean());

        verify(mPowerManager, timeout(SHORTCUT_KEY_DELAY_MILLIS))

                .userActivity(anyLong(), anyBoolean());

        verify(mGlobalActions).showDialog(anyBoolean(), anyBoolean());

        verify(mPowerManager).userActivity(anyLong(), anyBoolean());

    }



    void assertVolumeMute() {

        mTestLooper.dispatchAll();

        verify(mAudioManagerInternal, timeout(SHORTCUT_KEY_DELAY_MILLIS))

                .silenceRingerModeInternal(eq("volume_hush"));

        verify(mAudioManagerInternal).silenceRingerModeInternal(eq("volume_hush"));

    }



    void assertAccessibilityKeychordCalled() {

        mTestLooper.dispatchAll();

        verify(mAccessibilityShortcutController,

                timeout(SHORTCUT_KEY_DELAY_MILLIS)).performAccessibilityShortcut();

        verify(mAccessibilityShortcutController).performAccessibilityShortcut();

    }



    void assertDreamRequest() {
@@ -532,14 +531,12 @@ class TestPhoneWindowManager { 


    void assertPowerSleep() {

        mTestLooper.dispatchAll();

        verify(mPowerManager,

                timeout(SHORTCUT_KEY_DELAY_MILLIS)).goToSleep(anyLong(), anyInt(), anyInt());

        verify(mPowerManager).goToSleep(anyLong(), anyInt(), anyInt());

    }



    void assertPowerWakeUp() {

        mTestLooper.dispatchAll();

        verify(mPowerManager,

                timeout(SHORTCUT_KEY_DELAY_MILLIS)).wakeUp(anyLong(), anyInt(), anyString());

        verify(mPowerManager).wakeUp(anyLong(), anyInt(), anyString());

    }



    void assertNoPowerSleep() {
@@ -556,7 +553,7 @@ class TestPhoneWindowManager { 


    void assertSearchManagerLaunchAssist() {

        mTestLooper.dispatchAll();

        verify(mSearchManager, timeout(SHORTCUT_KEY_DELAY_MILLIS)).launchAssist(any());

        verify(mSearchManager).launchAssist(any());

    }



    void assertLaunchCategory(String category) {