summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-08-30 18:25:02 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-30 18:25:02 -0700
commit02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd (patch)
treef2bd88e08646217e026f469eec0e90c40a506c37 /core/java/android/preference
parent91b2eb933cbafbce13e2afa2220cd72d363be947 (diff)
parent734d270769c609c7d3a1f2ec46e1d329d9682ab4 (diff)
downloadframeworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.zip
frameworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.tar.gz
frameworks_base-02f4f0eb4919453e8dbf40549d4ae9c05f05b8dd.tar.bz2
am 734d2707: am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread
Merge commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4' * commit '734d270769c609c7d3a1f2ec46e1d329d9682ab4': 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 418fe10..17b2e82 100644
--- a/core/java/android/preference/Preference.java
+++ b/core/java/android/preference/Preference.java
@@ -1242,7 +1242,7 @@ public class Preference implements Comparable<Preference>, OnDependencyChangeLis
private void tryCommit(SharedPreferences.Editor editor) {
if (mPreferenceManager.shouldCommit()) {
- editor.startCommit();
+ editor.apply();
}
}