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

Commit ccb0dc32 authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Improve camera launch time from double tap power" into tm-qpr-dev am: 84d0bab4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20271252



Change-Id: I3cb0a0671e62456df8777b929d93e4535d47ed40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1b2ad78 84d0bab4

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

+4 −5
Original line number Diff line number Diff line
@@ -4143,6 +4143,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mCameraGestureTriggered = true;

        if (mRequestedOrSleepingDefaultDisplay) {

            mCameraGestureTriggeredDuringGoingToSleep = true;

            // Wake device up early to prevent display doing redundant turning off/on stuff.

            wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,

                    PowerManager.WAKE_REASON_CAMERA_LAUNCH,

                    "android.policy:CAMERA_GESTURE_PREVENT_LOCK");

        }

        return true;

    }
@@ -4674,11 +4678,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

            mDefaultDisplayRotation.updateOrientationListener();

            reportScreenStateToVrManager(false);

            if (mCameraGestureTriggeredDuringGoingToSleep) {

                wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,

                        PowerManager.WAKE_REASON_CAMERA_LAUNCH,

                        "com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");

            }

        }

    }