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

Commit e665698f authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue... 

am 6f33b65f: Merge "Fix issue #2999757: "Application Redirected" dialogue showing up erratically" into gingerbread

Merge commit '6f33b65f' into gingerbread-plus-aosp

* commit '6f33b65f':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
parents 83af4fbb 6f33b65f

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

+21 −17
Original line number Diff line number Diff line
@@ -1104,6 +1104,9 @@ 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.

        // XXX "App Redirected" dialog is getting too many false positives

        // at this point, so turn off for now.

        if (false) {

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

                long now = SystemClock.uptimeMillis();

                final boolean inTime = mLastStartedActivity.startTime != 0
@@ -1125,6 +1128,7 @@ public class ActivityStack { 
                next.startTime = SystemClock.uptimeMillis();

                mLastStartedActivity = next;

            }

        }

        

        // We need to start pausing the current activity so the top one

        // can be resumed...