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

Commit 88cfdae6 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev 

* commit 'cdd82540':
  When waiting for activity to finish don't reset
parents 53760b4a cdd82540

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