summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-02-17 11:13:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-17 11:13:20 -0800
commit4fa7091b1e912b6eebf436ab9ed566ffa7958a20 (patch)
tree7d0f8184bb7e96b25b74ec7799c97829ad1229ec /src/com/android
parent2ab5f27d77acc4dd7992c334e06b29b41936b412 (diff)
parent9fcefd19ee20ec9f792ddc84be9a871550e82997 (diff)
downloadpackages_apps_Browser-4fa7091b1e912b6eebf436ab9ed566ffa7958a20.zip
packages_apps_Browser-4fa7091b1e912b6eebf436ab9ed566ffa7958a20.tar.gz
packages_apps_Browser-4fa7091b1e912b6eebf436ab9ed566ffa7958a20.tar.bz2
Merge "fix NPE in setShouldShowErrorConsole"
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/BaseUi.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/browser/BaseUi.java b/src/com/android/browser/BaseUi.java
index 6e8f603..053fd7e 100644
--- a/src/com/android/browser/BaseUi.java
+++ b/src/com/android/browser/BaseUi.java
@@ -624,6 +624,7 @@ public abstract class BaseUi implements UI, WebViewFactory {
@Override
public void setShouldShowErrorConsole(Tab tab, boolean flag) {
+ if (tab == null) return;
ErrorConsoleView errorConsole = tab.getErrorConsole(true);
if (flag) {
// Setting the show state of the console will cause it's the layout