| Index: sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
|
| diff --git a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
|
| index 3d96e03c96af7a2fc436d3593eb58a3a3b6e1e56..64fdb4873ae3f4959cc919c477b8598377dabb81 100644
|
| --- a/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
|
| +++ b/sync/android/java/src/org/chromium/sync/notifier/InvalidationIntentProtocol.java
|
| @@ -115,8 +115,8 @@ public class InvalidationIntentProtocol {
|
|
|
| /** Returns whether {@code intent} is a registered types change intent. */
|
| public static boolean isRegisteredTypesChange(Intent intent) {
|
| - return intent.hasExtra(EXTRA_REGISTERED_TYPES) ||
|
| - intent.hasExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
|
| + return intent.hasExtra(EXTRA_REGISTERED_TYPES)
|
| + || intent.hasExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
|
| }
|
|
|
| /** Returns the object ids for which to register contained in the intent. */
|
| @@ -125,8 +125,8 @@ public class InvalidationIntentProtocol {
|
| intent.getIntegerArrayListExtra(EXTRA_REGISTERED_OBJECT_SOURCES);
|
| ArrayList<String> objectNames =
|
| intent.getStringArrayListExtra(EXTRA_REGISTERED_OBJECT_NAMES);
|
| - if (objectSources == null || objectNames == null ||
|
| - objectSources.size() != objectNames.size()) {
|
| + if (objectSources == null || objectNames == null
|
| + || objectSources.size() != objectNames.size()) {
|
| return null;
|
| }
|
| Set<ObjectId> objectIds = new HashSet<ObjectId>(objectSources.size());
|
|
|