summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2016-01-11 03:41:22 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-01-11 03:41:22 +0000
commit5eeefba37c8ef7fe6fed3cfc37d9f18f9d6e34b2 (patch)
tree65e86c432accea4759577cd26b5e038f2c5b31d9
parent263ce2b52a332dc9336280fda47fa6a060f5512e (diff)
parent6c4b87be9ea2b6c44a1c5f98fe6561f4008125e7 (diff)
Merge "Temporary patch to work around broken casting."
-rw-r--r--core/java/android/content/ContentProviderClient.java3
1 files changed, 2 insertions, 1 deletions
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 {