diff options
| author | John Reck <jreck@android.com> | 2012-09-13 09:19:15 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-13 09:19:16 -0700 |
| commit | b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e (patch) | |
| tree | c2ee5f8220c62a2a3f4e6505f85efa08e6712856 /src | |
| parent | d22af61d97b938d0c4124fbdaae627f3e85e7084 (diff) | |
| parent | 47ed4b883a66e08240066e0bd0aa66d1571005b3 (diff) | |
| download | packages_apps_browser-b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e.zip packages_apps_browser-b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e.tar.gz packages_apps_browser-b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e.tar.bz2 | |
Merge "BrowserSettings required a Controller sometimes"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/BrowserSettings.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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)) { |