commit fa2399ce839306c9d1cdb6764752e2f1e95ed6d0
author Baligh Uddin <baligh@google.com> Thu Sep 13 21:32:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 13 21:32:48 2012 -0700
tree 178b30c9901d95eacaa307b0b32b5956d6d2b83b
parent ce4ecc9442b653a5f07150bc99fd388c8cb36899
parent 9a7632ba06f81e77f5ea1d867d5874bacb84616a

Merge "Import translations. DO NOT MERGE"

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 7d3195a..4555c18 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -372,11 +372,11 @@
         if (PREF_SEARCH_ENGINE.equals(key)) {
             updateSearchEngine(false);
         } else if (PREF_FULLSCREEN.equals(key)) {
-            if (mController.getUi() != null) {
+            if (mController != null && mController.getUi() != null) {
                 mController.getUi().setFullscreen(useFullscreen());
             }
         } else if (PREF_ENABLE_QUICK_CONTROLS.equals(key)) {
-            if (mController.getUi() != null) {
+            if (mController != null && mController.getUi() != null) {
                 mController.getUi().setUseQuickControls(sharedPreferences.getBoolean(key, false));
             }
         } else if (PREF_LINK_PREFETCH.equals(key)) {