diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-03 13:27:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 13:27:51 -0700 |
| commit | 4f3c5589c8cfa797153d50aaff68eaf874048a9c (patch) | |
| tree | b95fc4714e2ff8eebe55a7c231d314dd69bc03fa /core/java/android/preference | |
| parent | 5410a602619f9e9ca1d8afb8bd12f93d4eeafbc1 (diff) | |
| parent | 9eb32c96c872512c8aedc8627a4b96e9ea2a1a28 (diff) | |
| download | frameworks_base-4f3c5589c8cfa797153d50aaff68eaf874048a9c.zip frameworks_base-4f3c5589c8cfa797153d50aaff68eaf874048a9c.tar.gz frameworks_base-4f3c5589c8cfa797153d50aaff68eaf874048a9c.tar.bz2 | |
am 9eb32c96: am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread
Merge commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28'
* commit '9eb32c96c872512c8aedc8627a4b96e9ea2a1a28':
More SharedPreferences commit() -> apply() changes.
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/PreferenceManager.java | 4 |
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; |