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

Commit a0eb56ac authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread

parents b07c0789 8c5755aa

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

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ public class ActivityStack { 
        // Okay we are now going to start a switch, to 'next'.  We may first

        // have to pause the current activity, but this is an important point

        // where we have decided to go to 'next' so keep track of that.

        if (mLastStartedActivity != null) {

        if (mLastStartedActivity != null && !mLastStartedActivity.finishing) {

            long now = SystemClock.uptimeMillis();

            final boolean inTime = mLastStartedActivity.startTime != 0

                    && (mLastStartedActivity.startTime + START_WARN_TIME) >= now;