From 034093a4ae94c0363cad36c60b41d41ea59420b1 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Mon, 20 Sep 2010 22:24:38 -0700
Subject: Fix issue #2999757: "Application Redirected" dialogue showing up
 erratically

Give up on this for now.

Change-Id: Ic66a36d468f8bcb313d9bde2809124cdfd74adb3
---
 .../java/com/android/server/am/ActivityStack.java  | 38 ++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
index 4fc8020..a4497d6 100644
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -1104,26 +1104,30 @@ 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 && !mLastStartedActivity.finishing) {
-            long now = SystemClock.uptimeMillis();
-            final boolean inTime = mLastStartedActivity.startTime != 0
-                    && (mLastStartedActivity.startTime + START_WARN_TIME) >= now;
-            final int lastUid = mLastStartedActivity.info.applicationInfo.uid;
-            final int nextUid = next.info.applicationInfo.uid;
-            if (inTime && lastUid != nextUid
-                    && lastUid != next.launchedFromUid
-                    && mService.checkPermission(
-                            android.Manifest.permission.STOP_APP_SWITCHES,
-                            -1, next.launchedFromUid)
-                    != PackageManager.PERMISSION_GRANTED) {
-                mService.showLaunchWarningLocked(mLastStartedActivity, next);
+        // 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
+                        && (mLastStartedActivity.startTime + START_WARN_TIME) >= now;
+                final int lastUid = mLastStartedActivity.info.applicationInfo.uid;
+                final int nextUid = next.info.applicationInfo.uid;
+                if (inTime && lastUid != nextUid
+                        && lastUid != next.launchedFromUid
+                        && mService.checkPermission(
+                                android.Manifest.permission.STOP_APP_SWITCHES,
+                                -1, next.launchedFromUid)
+                        != PackageManager.PERMISSION_GRANTED) {
+                    mService.showLaunchWarningLocked(mLastStartedActivity, next);
+                } else {
+                    next.startTime = now;
+                    mLastStartedActivity = next;
+                }
             } else {
-                next.startTime = now;
+                next.startTime = SystemClock.uptimeMillis();
                 mLastStartedActivity = next;
             }
-        } else {
-            next.startTime = SystemClock.uptimeMillis();
-            mLastStartedActivity = next;
         }
         
         // We need to start pausing the current activity so the top one
-- 
cgit v1.1