summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-09-03 12:46:25 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-03 12:46:25 -0700
commita2f2141c84923e34e003bec92b7435ea79b02ee8 (patch)
tree205a1c30c08208da35b2a1bb79ffe1c1f95336a9 /core/java/android/preference
parentd85621c938286a568b1173e7ab29f80ab93d27e1 (diff)
parentfa8e271636b9e9b86f247cdb4c91d9ebe9675c27 (diff)
downloadframeworks_base-a2f2141c84923e34e003bec92b7435ea79b02ee8.zip
frameworks_base-a2f2141c84923e34e003bec92b7435ea79b02ee8.tar.gz
frameworks_base-a2f2141c84923e34e003bec92b7435ea79b02ee8.tar.bz2
Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Diffstat (limited to 'core/java/android/preference')
-rw-r--r--core/java/android/preference/PreferenceManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/preference/PreferenceManager.java b/core/java/android/preference/PreferenceManager.java
index 2b20946..fa83897 100644
--- a/core/java/android/preference/PreferenceManager.java
+++ b/core/java/android/preference/PreferenceManager.java
@@ -443,7 +443,7 @@ public class PreferenceManager {
pm.setSharedPreferencesMode(sharedPreferencesMode);
pm.inflateFromResource(context, resId, null);
- defaultValueSp.edit().putBoolean(KEY_HAS_SET_DEFAULT_VALUES, true).commit();
+ defaultValueSp.edit().putBoolean(KEY_HAS_SET_DEFAULT_VALUES, true).apply();
}
}
@@ -481,7 +481,7 @@ public class PreferenceManager {
private void setNoCommit(boolean noCommit) {
if (!noCommit && mEditor != null) {
- mEditor.commit();
+ mEditor.apply();
}
mNoCommit = noCommit;