Revert "Treat everyone the same."

This reverts commit 7678aeddd9ca894d5acddef6f900d9d43af009ce.

Bug: 30051184, 29746499
Change-Id: Ibd8bc2771d67c4db61c82dcc8a569eb8adfef8de

1 files changed, 7 insertions, 1 deletions

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index e49eb34aeea8..9221fbb50c96 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -147,7 +147,13 @@ public class ContentProviderClient implements AutoCloseable {
             if (cursor == null) {
                 return null;
             }
-            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);