commit 6f63bb00529496b176a98ca798cb9ee2429ce7b8
author Amith Yamasani <yamasani@google.com> Tue Apr 14 22:37:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 14 22:37:26 2015 +0000
tree 8ce4b9edba31d79a58101ac6032bedf9fe268c92
parent 2eabe5b7a9c396b1d6baebca7505a4e921312fc2
parent abedd3890bcfb5144eabea9bf44dcd9e0c58dfb4

Merge "Handle null package argument"

services/core/java/com/android/server/content/SyncManager.java

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);