From 6c4b87be9ea2b6c44a1c5f98fe6561f4008125e7 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sun, 10 Jan 2016 20:40:08 -0700
Subject: Temporary patch to work around broken casting.

Bug: 26481405
Change-Id: If91ecfbfda94a2cb694098d456126f87311e1d05
---
 core/java/android/content/ContentProviderClient.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index 9221fbb50c96..4135487a78d2 100644
--- 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 {
-- 
cgit v1.2.3-59-g8ed1b