drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cursor leakage due to cancellation signal"

Browse Source
This commit is contained in:
Christopher Tate
2014-01-09 20:41:26 +00:00
committed by Gerrit Code Review
parent 76d5cdd820 55eda43af9
commit 35b7de4c45
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/ContentProviderNative.java
View File

@ -112,17 +112,24 @@ abstract public class ContentProviderNative extends Binder implements IContentPr
Cursor cursor = query(callingPkg, url, projection, selection, selectionArgs, Cursor cursor = query(callingPkg, url, projection, selection, selectionArgs,
sortOrder, cancellationSignal); sortOrder, cancellationSignal);
if (cursor != null) { if (cursor != null) {
CursorToBulkCursorAdaptor adaptor = null;
try { try {
CursorToBulkCursorAdaptor adaptor = new CursorToBulkCursorAdaptor( adaptor = new CursorToBulkCursorAdaptor(cursor, observer,
cursor, observer, getProviderName()); getProviderName());
BulkCursorDescriptor d = adaptor.getBulkCursorDescriptor();
cursor = null; cursor = null;
BulkCursorDescriptor d = adaptor.getBulkCursorDescriptor();
adaptor = null;
reply.writeNoException(); reply.writeNoException();
reply.writeInt(1); reply.writeInt(1);
d.writeToParcel(reply, Parcelable.PARCELABLE_WRITE_RETURN_VALUE); d.writeToParcel(reply, Parcelable.PARCELABLE_WRITE_RETURN_VALUE);
} finally { } finally {
// Close cursor if an exception was thrown while constructing the adaptor. // Close cursor if an exception was thrown while constructing the adaptor.
if (adaptor != null) {
adaptor.close();
}
if (cursor != null) { if (cursor != null) {
cursor.close(); cursor.close();
} }