Merge "Handle null package argument"
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index 4173b78..7cccef2 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -1190,7 +1190,7 @@
while (operationIterator.hasNext()) {
final SyncOperation op = operationIterator.next();
if (op.appIdle
- && getPackageName(op.target).equals(packageName)
+ && (packageName == null || getPackageName(op.target).equals(packageName))
&& (userId == UserHandle.USER_ALL || op.target.userId == userId)) {
op.appIdle = false;
clearBackoffSetting(op);