From 47ed4b883a66e08240066e0bd0aa66d1571005b3 Mon Sep 17 00:00:00 2001 From: Magnus Hallqvist Date: Fri, 31 Aug 2012 13:30:39 +0200 Subject: BrowserSettings required a Controller sometimes BrowserSettings can be used without a browser Controller, e.g. when accessed from system settings. But some null checks for this case were missing, these have now been added. Change-Id: I57762898d34ef3018569e0de1499be2922dabded --- src/com/android/browser/BrowserSettings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/com/android/browser/BrowserSettings.java') diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index 7d3195a37..4555c18b7 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -372,11 +372,11 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, 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)) { -- cgit v1.2.3