commit 6e71ab488d573d647176f0a86a5d5e4d5440bc3b
author Michael Kolb <kolby@google.com> Tue Feb 22 18:10:31 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 22 18:10:31 2011 -0800
tree 54dbf9ad4a9f30556c3ee6db17b8982194053788
parent 36a1dc9c75f7f0b6dfcc603f1b685ad0e96d6035
parent 05902aa39843613ea93dd0c1b41d561d4ea85ff9

Merge "fix NPE in drawClipped"

src/com/android/browser/XLargeUi.java

diff --git a/src/com/android/browser/XLargeUi.java b/src/com/android/browser/XLargeUi.java
index 8684042..7a00422 100644
--- a/src/com/android/browser/XLargeUi.java
+++ b/src/com/android/browser/XLargeUi.java
@@ -202,6 +202,9 @@
 
     @Override
     public void setActiveTab(Tab tab) {
+        if (mTitleBar.isEditingUrl()) {
+            mTitleBar.stopEditingUrl();
+        }
         super.setActiveTab(tab);
         ScrollWebView view = (ScrollWebView) tab.getWebView();
         // TabControl.setCurrentTab has been called before this,