am d7fb6d26: am a01250c7: Merge "Frameworks/base: Change String == to equals in Preference"

* commit 'd7fb6d26d809775996f70e23213392a3dcf10c8f': Frameworks/base: Change String == to equals in Preference
2015-03-28 05:11:07 +00:00
parent 1bca353268 d7fb6d26d8
commit 3fa46a0f79
1 changed files with 1 additions and 1 deletions
--- 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;
            }