commit df7a1d69eab05f643bc7ec8bc43e93b441a5b7ad
author Daichi Hirono <hirono@google.com> Mon Jan 11 08:00:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 11 08:00:35 2016 +0000
tree 6df968f7874d52fce382ff996fe341a5b2694316
parent 5eeefba37c8ef7fe6fed3cfc37d9f18f9d6e34b2
parent ab03cb1b469940ab672850e0d2de3c78025260d3

Merge "Clean up TestUtil."

core/java/android/content/ContentProviderClient.java

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index 9221fbb..4135487 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -148,7 +148,8 @@
                 return null;
             }
 
-            if ("com.google.android.gms".equals(mPackageName)) {
+            if ("com.google.android.gms".equals(mPackageName)
+                    || "com.google.android.syncadapters.contacts".equals(mPackageName)) {
                 // They're casting to a concrete subclass, sigh
                 return cursor;
             } else {