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

Commit 2a72c9cd 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: I51bad58b07d96228acac4efba682fbc31dafa218
parents 17a7890e f0380367

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

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

                    ensureActivitiesVisible(null /* starting */, 0 /* configChanges */,

                            !PRESERVE_WINDOWS);

                            !PRESERVE_WINDOWS);

                    nothingToResume = shouldSleepActivities();

                    nothingToResume = shouldSleepActivities();

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

                    nothingToResume = false;

                }

                }

            }

            }

            if (nothingToResume) {

            if (nothingToResume) {