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

Commit 54f48f37 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "Avoid ignoring turning on screen requested by slow activity" into... 

Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev am: 061e5065 am: f0380367

Change-Id: If1f0c1d06071ca684e9623212f0cc79d967a4a9d
parents ff0f4cb8 f0380367

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

+2 −0
Original line number Diff line number Diff line
@@ -1688,6 +1688,8 @@ class ActivityStack extends Task { 
                    ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,

                            !PRESERVE_WINDOWS);

                    nothingToResume = shouldSleepActivities();

                } else if (next.currentLaunchCanTurnScreenOn() && next.canTurnScreenOn()) {

                    nothingToResume = false;

                }

            }

            if (nothingToResume) {