From 7678aeddd9ca894d5acddef6f900d9d43af009ce Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 29 Jun 2016 15:24:37 -0600
Subject: Treat everyone the same.

Bug: 29746499
Change-Id: I8344e42c5c55e5414bcc223e4caa857dc06de750
---
 core/java/android/content/ContentProviderClient.java | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/java/android/content/ContentProviderClient.java b/core/java/android/content/ContentProviderClient.java
index 9221fbb50c96..e49eb34aeea8 100644
--- a/core/java/android/content/ContentProviderClient.java
+++ b/core/java/android/content/ContentProviderClient.java
@@ -147,13 +147,7 @@ public class ContentProviderClient implements AutoCloseable {
             if (cursor == null) {
                 return null;
             }
-
-            if ("com.google.android.gms".equals(mPackageName)) {
-                // They're casting to a concrete subclass, sigh
-                return cursor;
-            } else {
-                return new CursorWrapperInner(cursor);
-            }
+            return new CursorWrapperInner(cursor);
         } catch (DeadObjectException e) {
             if (!mStable) {
                 mContentResolver.unstableProviderDied(mContentProvider);
-- 
cgit v1.2.3-59-g8ed1b