commit 44f2cc91ddced2c7a095cd66f8cd78694ba84d1d
author Jeff Sharkey <jsharkey@google.com> Thu Jan 07 16:49:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 07 16:49:02 2016 +0000
tree a0f661ff303bb41411ca6673cdf8ff8f42d2d2fd
parent 5c8178d85769765bce2d94a9fad4a362480c1c3c
parent 8b0db0401e1a1c2582180edb39efb25e28521afa

Merge "GmsCore is casting to a concrete subclass, sigh."

core/java/android/content/ContentProviderClient.java

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index dec0d91..16b5a4b 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -144,7 +144,12 @@
             }
             final Cursor cursor = mContentProvider.query(mPackageName, url, projection, selection,
                     selectionArgs, sortOrder, remoteCancellationSignal);
-            return new CursorWrapperInner(cursor);
+            if ("com.google.android.gms".equals(mPackageName)) {
+                // They're casting to a concrete subclass, sigh
+                return cursor;
+            } else {
+                return new CursorWrapperInner(cursor);
+            }
         } catch (DeadObjectException e) {
             if (!mStable) {
                 mContentResolver.unstableProviderDied(mContentProvider);