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

Sync extras bundle comparison can throw NPE

Browse Source 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
This commit is contained in:
Shreyas Basarge
2015-11-13 01:41:59 +00:00
committed by android-build-merger
parent cff4e09e26 2f137b7705
commit 294611faa8
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/content/PeriodicSync.java
View File

@@ -21,6 +21,8 @@ import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.accounts.Account; import android.accounts.Account;
import java.util.Objects;
/** /**
* Value type that contains information about a periodic sync. * Value type that contains information about a periodic sync.
*/ */
@@ -147,7 +149,9 @@ public class PeriodicSync implements Parcelable {
if (!b2.containsKey(key)) { if (!b2.containsKey(key)) {
return false; 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; return false;
} }
} }