diff options
| -rw-r--r-- | core/java/android/content/SyncStorageEngine.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index bae6ad36759f..4a4edd21067f 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -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, |