commit cc63403643786905262f505ab5266d8e80b9924c
author Grace Kloba <klobag@google.com> Tue Jul 28 15:58:19 2009 -0700
committer Grace Kloba <klobag@google.com> Tue Jul 28 15:58:19 2009 -0700
tree b9c989d18bbd992ee02647926d55cdadab5f9ad9
parent 04b2e8e1688a869904ecedafa58349b14a73ba48

Fix #1964292. If the WEB_SEARCH starts from the Browser, load it in the
current window instead of a new window.

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index b444d0f..c19bd37 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -807,10 +807,11 @@
             urlData.setPostData(intent
                     .getByteArrayExtra(Browser.EXTRA_POST_DATA));
 
-            if (Intent.ACTION_VIEW.equals(action) &&
-                    (flags & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
-                final String appId =
-                        intent.getStringExtra(Browser.EXTRA_APPLICATION_ID);
+            final String appId = intent
+                    .getStringExtra(Browser.EXTRA_APPLICATION_ID);
+            if (Intent.ACTION_VIEW.equals(action)
+                    && !getPackageName().equals(appId)
+                    && (flags & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
                 final TabControl.Tab appTab = mTabControl.getTabFromId(appId);
                 if (appTab != null) {
                     Log.i(LOGTAG, "Reusing tab for " + appId);
@@ -931,6 +932,7 @@
         if (appData != null) {
             intent.putExtra(SearchManager.APP_DATA, appData);
         }
+        intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
         startActivity(intent);
 
         return true;