Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 376ee826 authored by Fred Quintana's avatar Fred Quintana Committed by Android (Google) Code Review
Browse files

Merge "make sure that pending operation reconstituted from disk always have an extras bundle"

parents bfd4c5fe 5695c7b4

core/java/android/content/SyncStorageEngine.java

+5 −1
Original line number Diff line number Diff line
@@ -1927,9 +1927,13 @@ public class SyncStorageEngine extends Handler { 
                }

                AuthorityInfo authority = mAuthorities.get(authorityId);

                if (authority != null) {

                    Bundle extras = null;

                    Bundle extras;

                    if (flatExtras != null) {

                        extras = unflattenBundle(flatExtras);

                    } else {

                        // if we are unable to parse the extras for whatever reason convert this

                        // to a regular sync by creating an empty extras

                        extras = new Bundle();

                    }

                    PendingOperation op = new PendingOperation(

                            authority.account, syncSource,