diff options
| author | Matthew Williams <mjwilliams@google.com> | 2015-10-20 20:42:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-20 20:42:07 +0000 |
| commit | cb937cbc6ae8a026a90ce524fd74a01e7d48726b (patch) | |
| tree | e5a55200aa1bde3a80992ca55361dad2cfddd068 /core | |
| parent | e2a49862c147161292b802d70070b7f6c91cca00 (diff) | |
| parent | 7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a (diff) | |
| download | frameworks_base-cb937cbc6ae8a026a90ce524fd74a01e7d48726b.zip frameworks_base-cb937cbc6ae8a026a90ce524fd74a01e7d48726b.tar.gz frameworks_base-cb937cbc6ae8a026a90ce524fd74a01e7d48726b.tar.bz2 | |
DO NOT MERGE Sync extras bundle comparison can throw NPE
am: 7d7a2254bc
* commit '7d7a2254bc41d2dfc34fbb8693cb0dad2ccd528a':
DO NOT MERGE Sync extras bundle comparison can throw NPE
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/PeriodicSync.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/PeriodicSync.java b/core/java/android/content/PeriodicSync.java index 3efd89a..0441ccc 100644 --- a/core/java/android/content/PeriodicSync.java +++ b/core/java/android/content/PeriodicSync.java @@ -21,6 +21,8 @@ import android.os.Bundle; import android.os.Parcel; import android.accounts.Account; +import java.util.Objects; + /** * Value type that contains information about a periodic sync. */ @@ -144,7 +146,9 @@ public class PeriodicSync implements Parcelable { if (!b2.containsKey(key)) { return false; } - if (!b1.get(key).equals(b2.get(key))) { + // Null check. According to ContentResolver#validateSyncExtrasBundle null-valued keys + // are allowed in the bundle. + if (!Objects.equals(b1.get(key), b2.get(key))) { return false; } } |