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

Commit 061e5065 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev

parents 43c30814 b26efb47

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) {