Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b0db040 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

GmsCore is casting to a concrete subclass, sigh. 

Since this technically wasn't an API change, there isn't a good
reason to protect with target API.  So change the behavior based on
the caller for now.

Bug: 26438049
Change-Id: I65aa1fc9af1f935544f8e191444440af4f98f26f
parent 9c180dd3

core/java/android/content/ContentProviderClient.java

+6 −1
Original line number Diff line number Diff line
@@ -144,7 +144,12 @@ public class ContentProviderClient implements AutoCloseable { 
            }

            final Cursor cursor = mContentProvider.query(mPackageName, url, projection, selection,

                    selectionArgs, sortOrder, remoteCancellationSignal);

            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);