Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9' into gingerbread-plus-aosp

* commit '6f33b65f8033cf8644eb4ba727421b90bd4c0ae9':
  Fix issue #2999757: "Application Redirected" dialogue showing up erratically
This commit is contained in:
Dianne Hackborn
2010-09-21 00:27:06 -07:00
committed by Android Git Automerger
parent 83af4fbb0e 6f33b65f80
commit e665698ffe
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -1104,6 +1104,9 @@ public class ActivityStack {
// Okay we are now going to start a switch, to 'next'. We may first // 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 // 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. // 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) { if (mLastStartedActivity != null && !mLastStartedActivity.finishing) {
long now = SystemClock.uptimeMillis(); long now = SystemClock.uptimeMillis();
final boolean inTime = mLastStartedActivity.startTime != 0 final boolean inTime = mLastStartedActivity.startTime != 0
@@ -1125,6 +1128,7 @@ public class ActivityStack {
next.startTime = SystemClock.uptimeMillis(); next.startTime = SystemClock.uptimeMillis();
mLastStartedActivity = next; mLastStartedActivity = next;
} }
}
// We need to start pausing the current activity so the top one // We need to start pausing the current activity so the top one
// can be resumed... // can be resumed...