summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-05-27 13:50:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-27 13:50:21 -0700
commit2ea0f5a1f04ac6021959372d2fd012a521dedf07 (patch)
tree7f8c37d4ef3afc8c5676dabaf9845bd7092dc252
parent3963b6c93a182ffbfe591bb4ca5ccf38a6188900 (diff)
parentb9f31c6bdc9fb20c88b8f6cf4a39f627fa228a83 (diff)
downloadpackages_apps_browser-2ea0f5a1f04ac6021959372d2fd012a521dedf07.zip
packages_apps_browser-2ea0f5a1f04ac6021959372d2fd012a521dedf07.tar.gz
packages_apps_browser-2ea0f5a1f04ac6021959372d2fd012a521dedf07.tar.bz2
am b9f31c6b: Merge "DO NOT MERGE Fix vanishing title/url in window picker" into gingerbread
* commit 'b9f31c6bdc9fb20c88b8f6cf4a39f627fa228a83': DO NOT MERGE Fix vanishing title/url in window picker
-rw-r--r--src/com/android/browser/Tab.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 7019c8a..1d84088 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -43,6 +43,7 @@ import android.os.Message;
import android.os.SystemClock;
import android.provider.Browser;
import android.speech.RecognizerResultsIntent;
+import android.text.TextUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -1862,8 +1863,8 @@ class Tab {
// Populate the picker data using the given history item and the current top
// WebView.
private void populatePickerData(WebHistoryItem item) {
- mPickerData = new PickerData();
- if (item != null) {
+ if (item != null && !TextUtils.isEmpty(item.getUrl())) {
+ mPickerData = new PickerData();
mPickerData.mUrl = item.getUrl();
mPickerData.mTitle = item.getTitle();
mPickerData.mFavicon = item.getFavicon();
@@ -1950,7 +1951,6 @@ class Tab {
// Restore the internal state even if the WebView fails to restore.
// This will maintain the app id, original url and close-on-exit values.
mSavedState = null;
- mPickerData = null;
mCloseOnExit = b.getBoolean(CLOSEONEXIT);
mAppId = b.getString(APPID);
mOriginalUrl = b.getString(ORIGINALURL);