diff options
| author | Android Git Automerger <android-git-automerger@android.com> | 2009-07-29 17:03:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-29 17:03:43 -0700 |
| commit | 438c5e64fc822cf1bac0648d7964988972d7d4e0 (patch) | |
| tree | 1bcbfae501bc08884fdf83dcbeb99fec50a2c6b2 /src/com/android/browser | |
| parent | 907c5763bb700c705108948328c8892500e59185 (diff) | |
| parent | cc63403643786905262f505ab5266d8e80b9924c (diff) | |
| download | packages_apps_Browser-438c5e64fc822cf1bac0648d7964988972d7d4e0.zip packages_apps_Browser-438c5e64fc822cf1bac0648d7964988972d7d4e0.tar.gz packages_apps_Browser-438c5e64fc822cf1bac0648d7964988972d7d4e0.tar.bz2 | |
resolved conflicts for merge of cc634036 to master
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 7f40494..a2b5c88 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -894,10 +894,11 @@ public class BrowserActivity extends Activity 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) { TabControl.Tab appTab = mTabControl.getTabFromId(appId); if (appTab != null) { Log.i(LOGTAG, "Reusing tab for " + appId); @@ -1038,6 +1039,7 @@ public class BrowserActivity extends Activity if (appData != null) { intent.putExtra(SearchManager.APP_DATA, appData); } + intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName()); startActivity(intent); return true; |