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

Commit 10bbc3f1 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 rvc-dev am: 061e5065 

Change-Id: Ibd01da04f0bda91a1a3855781cae076de7fea479
parents a421fed1 061e5065

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