Temporary patch to work around broken casting.

Bug: 26481405
Change-Id: If91ecfbfda94a2cb694098d456126f87311e1d05

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index 9221fbb..4135487 100644 (file)
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -148,7 +148,8 @@ public class ContentProviderClient implements AutoCloseable {
                 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 {