diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-10-14 21:06:22 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-14 21:06:22 -0700 |
commit | aac01f699f9f6ccf285bdec7e89ff864f180409d (patch) | |
tree | 40ec9faa4d872f40a4d9057125aa3471f604b4e7 /core/java/android/content | |
parent | 04263dc591b07a4d5a9b53163dcb421ccffd34d4 (diff) | |
parent | 825c5132bff21e72c1448241f4c6868563c8d624 (diff) | |
download | frameworks_base-aac01f699f9f6ccf285bdec7e89ff864f180409d.zip frameworks_base-aac01f699f9f6ccf285bdec7e89ff864f180409d.tar.gz frameworks_base-aac01f699f9f6ccf285bdec7e89ff864f180409d.tar.bz2 |
Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"
Diffstat (limited to 'core/java/android/content')
-rw-r--r-- | core/java/android/content/ContentResolver.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index e923349..cc3219b 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.AssetFileDescriptor; import android.content.res.Resources; import android.database.ContentObserver; +import android.database.CrossProcessCursorWrapper; import android.database.Cursor; import android.database.CursorWrapper; import android.database.IContentObserver; @@ -1568,7 +1569,7 @@ public abstract class ContentResolver { samplePercent); } - private final class CursorWrapperInner extends CursorWrapper { + private final class CursorWrapperInner extends CrossProcessCursorWrapper { private final IContentProvider mContentProvider; public static final String TAG="CursorWrapperInner"; |