Merge "Treat everyone the same, redux."

2016-11-16 17:58:19 +00:00
parent 5e3935eca2 13deeafe46
commit f2f406cade
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);