Merge "Sometimes Screen does not wake up while receiving whatsapp video call" am: 540962a60a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2620918 Change-Id: Ic7579381b27b113c81b2e3911d8c84e2ab1818ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -663,8 +663,7 @@ class KeyguardController {
|
|||||||
display.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
|
display.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mTopTurnScreenOnActivity != lastTurnScreenOnActivity
|
if (mTopTurnScreenOnActivity != null
|
||||||
&& mTopTurnScreenOnActivity != null
|
|
||||||
&& !mService.mWindowManager.mPowerManager.isInteractive()
|
&& !mService.mWindowManager.mPowerManager.isInteractive()
|
||||||
&& (mRequestDismissKeyguard || occludedByActivity)) {
|
&& (mRequestDismissKeyguard || occludedByActivity)) {
|
||||||
controller.mTaskSupervisor.wakeUp("handleTurnScreenOn");
|
controller.mTaskSupervisor.wakeUp("handleTurnScreenOn");
|
||||||
|
|||||||
Reference in New Issue
Block a user