Merge \"Treat everyone the same.\" into nyc-mr1-dev

am: a1b026ea2e Change-Id: I853c743364189e689e29d87ab6c53b7963ebae2f
2016-07-07 20:27:55 +00:00
parent 901104ad94 a1b026ea2e
commit f32a5c426f
1 changed files with 1 additions and 7 deletions
--- 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);