Merge "Temporary patch to work around broken casting."

2016-01-11 03:41:22 +00:00
parent 263ce2b52a 6c4b87be9e
commit 5eeefba37c
1 changed files with 2 additions and 1 deletions
--- 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 {