summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-30 18:18:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 18:18:54 -0700
commit734d270769c609c7d3a1f2ec46e1d329d9682ab4 (patch)
treea6c455a9a3b31eb0ecdbc591b2750f4d29ff5b20 /core/java/android/preference
parent03e83d4ad909f5c07fb2011e03348a413453e909 (diff)
parentbb660d7e1bed3a07a1804bd9641d9634bfaa4972 (diff)
downloadframeworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.zip
frameworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.tar.gz
frameworks_base-734d270769c609c7d3a1f2ec46e1d329d9682ab4.tar.bz2
am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972' into gingerbread-plus-aosp * commit 'bb660d7e1bed3a07a1804bd9641d9634bfaa4972': Renaming SharedPreferences$Editor.startCommit to apply
Diffstat (limited to 'core/java/android/preference')
-rw-r--r--core/java/android/preference/Preference.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java
index 1453329..dde6493 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -1195,7 +1195,7 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
private void tryCommit(SharedPreferences.Editor editor) {
if (mPreferenceManager.shouldCommit()) {
- editor.startCommit();
+ editor.apply();
}
}