From 8c5755aab5bac94a15e923d07c423629737fa6a2 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 13 Sep 2010 16:58:59 -0700 Subject: [PATCH] Work on issue #2991868: A toast pops up informing users... ...that Market took over the screen after signing into a Google account Don't warn the user about a new activity coming up on an activity that is finishing. Change-Id: I573073139d42a485473d0c8a7df450c1a23c35c3 --- services/java/com/android/server/am/ActivityStack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index a0c21ddc35257..4fc802003312f 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -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;