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

Commit 345ad897 authored by Pechetty Sravani (xWF)'s avatar Pechetty Sravani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "Fixes failing PowerMenuTest." 

Revert submission 30763741-revert-30698369-revert-30412668-HWHJRSWUQP-SSEJIYIUHQ

Reason for revert: <Droidmonitor created revert due to b/383004544.Will be verified through ABTD for standard investigation.>

Reverted changes: /q/submissionid:30763741-revert-30698369-revert-30412668-HWHJRSWUQP-SSEJIYIUHQ

Change-Id: I7aec7e11eeabd10d30ae0508c93cd7a6d633404d
parent 0d09c285

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

+4 −5
Original line number Diff line number Diff line
@@ -5900,9 +5900,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 


        if (event.getKeyCode() == KEYCODE_POWER && event.getAction() == KeyEvent.ACTION_DOWN) {

            if (overridePowerKeyBehaviorInFocusedWindow()) {

                if (event.getRepeatCount() > 0) {

                    return;

                }

                if (mGestureLauncherService != null) {

                    mGestureLauncherService.processPowerKeyDown(event);

                }
@@ -5940,8 +5937,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private boolean detectDoubleTapPower(KeyEvent event) {

        if (event.getKeyCode() != KEYCODE_POWER || event.getAction() != KeyEvent.ACTION_DOWN

                || event.getRepeatCount() != 0) {

        if (event.getKeyCode() != KEYCODE_POWER || event.getAction() != KeyEvent.ACTION_DOWN) {

            return false;

        }

        if (event.isLongPress()) {

            return false;

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -124,14 +124,14 @@ public class PowerKeyGestureTests extends ShortcutKeyTestBase { 
    public void testPowerLongPress() {

        // Show assistant.

        mPhoneWindowManager.overrideLongPressOnPower(LONG_PRESS_POWER_ASSISTANT);

        sendKey(KEYCODE_POWER, SingleKeyGestureDetector.sDefaultLongPressTimeout);

        sendKey(KEYCODE_POWER, true);

        mPhoneWindowManager.assertSearchManagerLaunchAssist();



        mPhoneWindowManager.moveTimeForward(POWER_MULTI_PRESS_TIMEOUT_MILLIS);



        // Show global actions.

        mPhoneWindowManager.overrideLongPressOnPower(LONG_PRESS_POWER_GLOBAL_ACTIONS);

        sendKey(KEYCODE_POWER, SingleKeyGestureDetector.sDefaultLongPressTimeout);

        sendKey(KEYCODE_POWER, true);

        mPhoneWindowManager.assertShowGlobalActionsCalled();

    }

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

+0 −4
Original line number Diff line number Diff line
@@ -236,10 +236,6 @@ class ShortcutKeyTestBase { 
        sendKeyCombination(new int[]{keyCode}, 0 /*durationMillis*/, longPress, DEFAULT_DISPLAY);

    }



    void sendKey(int keyCode, long durationMillis) {

        sendKeyCombination(new int[]{keyCode}, durationMillis, false, DEFAULT_DISPLAY);

    }



    boolean sendKeyGestureEventStart(int gestureType) {

        return mPhoneWindowManager.sendKeyGestureEvent(

                new KeyGestureEvent.Builder().setKeyGestureType(gestureType).setAction(