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

Commit 19cdeaf8 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix startActivityAndWait bugs"

parents fd63af2d c64f73e7

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

+3 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ public class ActivityStackSupervisor { 
    void reportActivityLaunchedLocked(boolean timeout, ActivityRecord r,

            long thisTime, long totalTime) {

        for (int i = mWaitingActivityLaunched.size() - 1; i >= 0; i--) {

            WaitResult w = mWaitingActivityLaunched.get(i);

            WaitResult w = mWaitingActivityLaunched.remove(i);

            w.timeout = timeout;

            if (r != null) {

                w.who = new ComponentName(r.info.packageName, r.info.name);
@@ -2182,7 +2182,8 @@ public class ActivityStackSupervisor { 
    }



    void scheduleIdleTimeoutLocked(ActivityRecord next) {

        mHandler.obtainMessage(IDLE_TIMEOUT_MSG, next).sendToTarget();

        Message msg = mHandler.obtainMessage(IDLE_TIMEOUT_MSG, next);

        mHandler.sendMessageDelayed(msg, IDLE_TIMEOUT);

    }



    final void scheduleIdleLocked() {