diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-28 05:03:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-28 05:03:25 +0000 |
| commit | d7fb6d26d809775996f70e23213392a3dcf10c8f (patch) | |
| tree | 3f7b3fe600eac1f03e2fbb2d4b44d43c883b161a /core | |
| parent | 0e6b4da5ca53d338f351827f7a351edcd6281aaa (diff) | |
| parent | a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7 (diff) | |
| download | frameworks_base-d7fb6d26d809775996f70e23213392a3dcf10c8f.zip frameworks_base-d7fb6d26d809775996f70e23213392a3dcf10c8f.tar.gz frameworks_base-d7fb6d26d809775996f70e23213392a3dcf10c8f.tar.bz2 | |
am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"
* commit 'a01250c7740aec4f2cfc92a82d5a10f05c3e7ce7':
Frameworks/base: Change String == to equals in Preference
Diffstat (limited to 'core')
| -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 0224c73..d989cd1 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -1426,7 +1426,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; } |
