Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix preference puts with "null" values."

Browse Source
This commit is contained in:
Narayan Kamath
2014-01-13 12:29:41 +00:00
committed by Gerrit Code Review
parent 868173a53f c6f429007c
commit cb4d3ec1ea
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/SharedPreferencesImpl.java
View File

@@ -421,13 +421,15 @@ final class SharedPreferencesImpl implements SharedPreferences {
for (Map.Entry<String, Object> e : mModified.entrySet()) { for (Map.Entry<String, Object> e : mModified.entrySet()) {
String k = e.getKey(); String k = e.getKey();
Object v = e.getValue(); Object v = e.getValue();
if (v == this) { // magic value for a removal mutation // "this" is the magic value for a removal mutation. In addition,
// setting a value to "null" for a given key is specified to be
// equivalent to calling remove on that key.
if (v == this || v == null) {
if (!mMap.containsKey(k)) { if (!mMap.containsKey(k)) {
continue; continue;
} }
mMap.remove(k); mMap.remove(k);
} else { } else {
boolean isSame = false;
if (mMap.containsKey(k)) { if (mMap.containsKey(k)) {
Object existingValue = mMap.get(k); Object existingValue = mMap.get(k);
if (existingValue != null && existingValue.equals(v)) { if (existingValue != null && existingValue.equals(v)) {