aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-26 15:53:01 -0700
committerBrad Fitzpatrick <bradfitz@android.com>2010-08-30 17:49:46 -0700
commit9516b6eef76b3504913f5efcadf603969946a3d0 (patch)
tree49ed6c41f4b2a589824bfc79fb41bcf6aa5a6e03
parentf1ee431f3c9e6074ed308312867808490b1770f6 (diff)
downloadContactsProvider-9516b6eef76b3504913f5efcadf603969946a3d0.tar.gz
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
-rw-r--r--src/com/android/providers/contacts/ContactsProvider2.java2
-rw-r--r--src/com/android/providers/contacts/ContactsUpgradeReceiver.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 66a81ff9..50c97bb1 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -2088,7 +2088,7 @@ public class ContactsProvider2 extends SQLiteContentProvider implements OnAccoun
@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 24fd0d26..747ecca9 100644
--- a/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
+++ b/src/com/android/providers/contacts/ContactsUpgradeReceiver.java
@@ -56,7 +56,8 @@ public class ContactsUpgradeReceiver extends BroadcastReceiver {
// 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