Fix FastScrollingIndexCache test

Make sure the FastScrollingIndexCache instance used for the unit tests
was created with the correct MockSharedPreferences

Bug:
Change-Id: I612638dadab394ea3ed8abbbe6f47de5f17601fe

1 files changed, 8 insertions, 10 deletions

diff --git a/src/com/android/providers/contacts/FastScrollingIndexCache.java b/src/com/android/providers/contacts/FastScrollingIndexCache.java
index 9b3908e..e535225 100644
--- a/src/com/android/providers/contacts/FastScrollingIndexCache.java
+++ b/src/com/android/providers/contacts/FastScrollingIndexCache.java
@@ -88,24 +88,22 @@ public class FastScrollingIndexCache {
     private static FastScrollingIndexCache sSingleton;
 
     public static FastScrollingIndexCache getInstance(Context context) {
-        return getInstance(PreferenceManager.getDefaultSharedPreferences(context));
-    }
-
-    public static synchronized FastScrollingIndexCache getInstance(
-            SharedPreferences prefs) {
         if (sSingleton == null) {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             sSingleton = new FastScrollingIndexCache(prefs);
         }
         return sSingleton;
     }
 
-    private FastScrollingIndexCache(SharedPreferences prefs) {
-        mPrefs = prefs;
+    @VisibleForTesting
+    static synchronized FastScrollingIndexCache getInstanceForTest(
+            SharedPreferences prefs) {
+        sSingleton = new FastScrollingIndexCache(prefs);
+        return sSingleton;
     }
 
-    @VisibleForTesting
-    protected static synchronized void releaseInstance() {
-        sSingleton = null;
+    private FastScrollingIndexCache(SharedPreferences prefs) {
+        mPrefs = prefs;
     }
 
     /**