Merge \"Revert \"Treat everyone the same.\"\" into nyc-mr1-dev (6e4fc196) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProviderClient.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,13 @@ 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);
		}
		} catch (DeadObjectException e) {
		if (!mStable) {
		mContentResolver.unstableProviderDied(mContentProvider);