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

Commit 5c494547 authored by Craig Mautner's avatar Craig Mautner
Browse files

When waiting for activity to finish don't reset 

In cases where the client is waiting for an activity to launch
(startActivityMayWait()) it is a bad idea to clear
ActivityRecord.displayStartTime when going into the pause state. If
displayStartTime is cleared before the activity is displayed,
the client will never be released.

This fix keeps pause from clearing displayStartTime if any client
is waiting for the activity to be displayed.

Fixes bug 10095558. But not a permanent fix, startActivityMayWait()
should not be called by any production code.

Change-Id: I7cbdcb04256f4a26233867c52aedd3bc4151adc3
parent bdd61696

services/java/com/android/server/am/ActivityStack.java

+7 −1
Original line number Diff line number Diff line
@@ -620,7 +620,13 @@ final class ActivityStack { 
    }



    void clearLaunchTime(ActivityRecord r) {

        // Make sure that there is no activity waiting for this to launch.

        if (mStackSupervisor.mWaitingActivityLaunched.isEmpty()) {

            r.displayStartTime = r.fullyDrawnStartTime = 0;

        } else {

            mStackSupervisor.removeTimeoutsForActivityLocked(r);

            mStackSupervisor.scheduleIdleTimeoutLocked(r);

        }

    }



    void awakeFromSleepingLocked() {