Use new SharedPreferences$Editor.apply() instead of commit().
apply() starts an async disk write and doesn't have a return value but
is otherwise identical in observable effects.
Change-Id: Icd6065e9ef650f80a93e1397bfd6300edc2670c0
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 66a81ff..50c97bb 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -2088,7 +2088,7 @@
@Override
protected void onPostExecute(Void result) {
- prefs.edit().putString(PREF_LOCALE, currentLocale.toString()).commit();
+ prefs.edit().putString(PREF_LOCALE, currentLocale.toString()).apply();
setProviderStatus(savedProviderStatus);
// Recursive invocation, needed to cover the case where locale
diff --git a/src/com/android/providers/contacts/ContactsUpgradeReceiver.java b/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
index 24fd0d2..747ecca 100644
--- a/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
+++ b/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
@@ -56,7 +56,8 @@
// version number changes. This is intentionally done even before the upgrade path
// is attempted to be conservative. If the upgrade fails for some reason and we
// crash and burn we don't want to get into a loop doing so.
- prefs.edit().putInt(PREF_DB_VERSION, ContactsDatabaseHelper.DATABASE_VERSION).commit();
+ prefs.edit().putInt(
+ PREF_DB_VERSION, ContactsDatabaseHelper.DATABASE_VERSION).apply();
// Ask for a reference to the database to force the helper to either
// create the database or open it up, performing any necessary upgrades