commit 3bb46303a9fd74db484f123a9293944ab5007bd1
author Bijan Amirzada <bijana@codeaurora.org> Tue Jun 17 16:31:31 2014 -0700
committer WebTech Code Review <code-review@localhost> Thu Jul 24 13:10:41 2014 -0700
tree 4972dc415490c3fef3b5df6b2930519e729972a1
parent 16c6bcecb1841cf957ce07646cfdcf4a00452aa1

Fix to ensure single instance of BrowserSettings

Change-Id: I696f3addecbac9674bfce9c1077257119fac9e02

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index ba827b9..2f93d57 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -131,8 +131,9 @@
 
     private static String sFactoryResetUrl;
 
-    public static void initialize(final Context context) {
-        sInstance = new BrowserSettings(context);
+    public static synchronized void initialize(final Context context) {
+        if (sInstance == null)
+            sInstance = new BrowserSettings(context);
     }
 
     public static BrowserSettings getInstance() {