diff options
author | Andreas Gampe <agampe@google.com> | 2015-03-28 05:18:14 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-28 05:18:14 +0000 |
commit | 822b403b687065e74efe2c5316638d4e2eda1863 (patch) | |
tree | 4661b1abd9018b24eca91376fc8e9aca68d7273d /core/java/android/preference/Preference.java | |
parent | 2d3455993e857b0da029abe9ce8dd88801319d07 (diff) | |
parent | 3fa46a0f79f35ca32ce102d4bbb1138c517ee754 (diff) | |
download | frameworks_base-822b403b687065e74efe2c5316638d4e2eda1863.zip frameworks_base-822b403b687065e74efe2c5316638d4e2eda1863.tar.gz frameworks_base-822b403b687065e74efe2c5316638d4e2eda1863.tar.bz2 |
am 3fa46a0f: am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit '3fa46a0f79f35ca32ce102d4bbb1138c517ee754':
Frameworks/base: Change String == to equals in Preference
Diffstat (limited to 'core/java/android/preference/Preference.java')
-rw-r--r-- | core/java/android/preference/Preference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index f32e8cf..3b482eb 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -1438,7 +1438,7 @@ public class Preference implements Comparable<Preference> { protected boolean persistString(String value) { if (shouldPersist()) { // Shouldn't store null - if (value == getPersistedString(null)) { + if (TextUtils.equals(value, getPersistedString(null))) { // It's already there, so the same as persisting return true; } |