contactscommon: ensure preferences are loaded before reload data

SIM state event can arrive early than the preferences were loaded. Just ensure that preferences are loaded
in that event too.
JIRA: NIGHTLIES-884

Change-Id: I9909c3a2302b9aa83f41365514cea622ab568a05
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/src/com/android/contacts/common/list/ContactEntryListFragment.java b/src/com/android/contacts/common/list/ContactEntryListFragment.java
index e33f2272..a345c320 100755
--- a/src/com/android/contacts/common/list/ContactEntryListFragment.java
+++ b/src/com/android/contacts/common/list/ContactEntryListFragment.java
@@ -156,6 +156,7 @@ public abstract class ContactEntryListFragment<T extends ContactEntryListAdapter
         @Override
         public void onReceive(Context context, Intent intent) {
             if (!mIgnoreSimStateChange) {
+                mForceLoad = loadPreferences();
                 reloadData();
             }
             mIgnoreSimStateChange = false;
diff --git a/src/com/android/contacts/common/preference/ContactsPreferences.java b/src/com/android/contacts/common/preference/ContactsPreferences.java
index 5c07f83f..36d916e1 100644
--- a/src/com/android/contacts/common/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/common/preference/ContactsPreferences.java
@@ -52,6 +52,11 @@ public final class ContactsPreferences implements OnSharedPreferenceChangeListen
      */
     public static final int SORT_ORDER_PRIMARY = 1;
 
+    /**
+     * The value for the SORT_ORDER key corresponding to sort by family name first.
+     */
+    public static final int SORT_ORDER_ALTERNATIVE = 2;
+
     public static final String SORT_ORDER_KEY = "android.contacts.SORT_ORDER";
 
     /**
@@ -59,11 +64,6 @@ public final class ContactsPreferences implements OnSharedPreferenceChangeListen
      */
     public static final String IMPORTED_SIMS_SNS = "android.contacts.IMPORTED_SIMS";
 
-    /**
-     * The value for the SORT_ORDER key corresponding to sort by family name first.
-     */
-    public static final int SORT_ORDER_ALTERNATIVE = 2;
-
     public static final String PREF_DISPLAY_ONLY_PHONES = "only_phones";
     public static final boolean PREF_DISPLAY_ONLY_PHONES_DEFAULT = false;