commit 8654d4263746166ebf343e7a8ae75346cd56a093
author Bijan Amirzada <bijana@codeaurora.org> Thu Jun 12 14:17:16 2014 -0700
committer WebTech Code Review <code-review@localhost> Wed Jun 25 14:48:11 2014 -0700
tree 29234c29106ba98eb6baec025501eb9c1abc9616
parent b10bbdac3c2d7a75491859c11b84a8ce6ee29d1a

Fix for null BrowserSettings in BrowserProvider2

BrowserSettings was null on the first call from
the homepage provider.  BrowserProvider2.query was
getting called before the full initialization of the
browser (browser.java) could complete.

Change-Id: I8b9b053148b7ee3f568596b0cba6cdabd9f13741

src/com/android/browser/provider/BrowserProvider2.java

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index d861a27..aa77c83 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -1132,6 +1132,9 @@
             }
 
             case HOMEPAGE: {
+                if (BrowserSettings.getInstance() == null) {
+                    BrowserSettings.initialize(getContext());
+                }
                 String homepage = BrowserSettings.getInstance().getHomePage();
                 Log.d(TAG,"get home page for DM");
                 if (null == homepage) {