commit d08d6686c5e16cedc23cd9bc836a28d629b8622c
author Matthew Williams <mjwilliams@google.com> Mon Oct 14 10:39:41 2013 -0700
committer Matthew Williams <mjwilliams@google.com> Mon Oct 14 10:39:41 2013 -0700
tree a2ef9a87b326d3d5715fd0cb309fee5a78199ea8
parent 8f7b859a7dffc1526a7e357c9d0ec6e1a7854da9
parent 94b518101c2b2587cb60664dde8931b11f154ec0

resolved conflicts for merge of 94b51810 to master

Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49

services/java/com/android/server/content/SyncStorageEngine.java

diff --git a/services/java/com/android/server/content/SyncStorageEngine.java b/services/java/com/android/server/content/SyncStorageEngine.java
index 1d8ca5a..1227374 100644
--- a/services/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/java/com/android/server/content/SyncStorageEngine.java
@@ -1486,9 +1486,9 @@
      */
     public SyncStatusInfo getStatusByAuthority(EndPoint info) {
         if (info.target_provider && (info.account == null || info.provider == null)) {
-          throw new IllegalArgumentException();
+            return null;
         } else if (info.target_service && info.service == null) {
-            throw new IllegalArgumentException();
+            return null;
         }
         synchronized (mAuthorities) {
             final int N = mSyncStatus.size();