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

am: 9dbc259b4f Change-Id: Idbddd94cb16c2dee3891bcff14ceb618793dd767
2016-07-11 21:34:05 +00:00
parent ec83bd15c8 9dbc259b4f
commit 6e4fc19617
1 changed files with 7 additions and 1 deletions
--- 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);