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

Commit d5eca2b0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sometimes Screen does not wake up while receiving whatsapp video call"... 

Merge "Sometimes Screen does not wake up while receiving whatsapp video call" am: 540962a6 am: 67bbb93d am: 72a09010 am: 3a5c7b92 am: a0bb91ff am: f060c7e0

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



Change-Id: I6895115673fcb554937583e2eaa65d2d67512a82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 461651a1 f060c7e0

services/core/java/com/android/server/wm/KeyguardController.java

+1 −2
Original line number Diff line number Diff line
@@ -671,8 +671,7 @@ class KeyguardController { 
                display.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;

            }



            if (mTopTurnScreenOnActivity != lastTurnScreenOnActivity

                    && mTopTurnScreenOnActivity != null

            if (mTopTurnScreenOnActivity != null

                    && !mService.mWindowManager.mPowerManager.isInteractive()

                    && (mRequestDismissKeyguard || occludedByActivity)) {

                controller.mTaskSupervisor.wakeUp("handleTurnScreenOn");