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

Commit eb85dd84 authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Inject WindowWakeUpPolicy" into main

parents 94be4d2e a4e26393

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

+5 −1
Original line number Diff line number Diff line
@@ -2185,6 +2185,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        TalkbackShortcutController getTalkbackShortcutController() {

            return new TalkbackShortcutController(mContext);

        }



        WindowWakeUpPolicy getWindowWakeUpPolicy() {

            return new WindowWakeUpPolicy(mContext);

        }

    }



    /** {@inheritDoc} */
@@ -2433,7 +2437,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                com.android.internal.R.integer.config_keyguardDrawnTimeout);

        mKeyguardDelegate = injector.getKeyguardServiceDelegate();

        mTalkbackShortcutController = injector.getTalkbackShortcutController();

        mWindowWakeUpPolicy = new WindowWakeUpPolicy(mContext);

        mWindowWakeUpPolicy = injector.getWindowWakeUpPolicy();

        initKeyCombinationRules();

        initSingleKeyGestureRules(injector.getLooper());

        mButtonOverridePermissionChecker = injector.getButtonOverridePermissionChecker();

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

+7 −1
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ class TestPhoneWindowManager { 


    @Mock

    private PhoneWindowManager.ButtonOverridePermissionChecker mButtonOverridePermissionChecker;

    @Mock private WindowWakeUpPolicy mWindowWakeUpPolicy;



    @Mock private IBinder mInputToken;

    @Mock private IBinder mImeTargetWindowToken;
@@ -230,6 +231,10 @@ class TestPhoneWindowManager { 
        TalkbackShortcutController getTalkbackShortcutController() {

            return new TestTalkbackShortcutController(mContext);

        }



        WindowWakeUpPolicy getWindowWakeUpPolicy() {

            return mWindowWakeUpPolicy;

        }

    }



    TestPhoneWindowManager(Context context, boolean supportSettingsUpdate) {
@@ -620,7 +625,8 @@ class TestPhoneWindowManager { 


    void assertPowerWakeUp() {

        mTestLooper.dispatchAll();

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

        verify(mWindowWakeUpPolicy)

                .wakeUpFromKey(anyLong(), eq(KeyEvent.KEYCODE_POWER), anyBoolean());

    }



    void assertNoPowerSleep() {