am eb717b9c: Merge change 4477 into donut
Merge commit 'eb717b9c4337e5b88664802b0804f4cb48758120' * commit 'eb717b9c4337e5b88664802b0804f4cb48758120': BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
This commit is contained in:
committed by
The Android Open Source Project
commit
ffe4ddfe95
@@ -247,9 +247,11 @@ public final class BulkCursorToCursorAdaptor extends AbstractWindowedCursor {
|
||||
try {
|
||||
return mBulkCursor.respond(extras);
|
||||
} catch (RemoteException e) {
|
||||
// This should never happen because the system kills processes that are using remote
|
||||
// cursors when the provider process is killed.
|
||||
throw new RuntimeException(e);
|
||||
// the system kills processes that are using remote cursors when the provider process
|
||||
// is killed, but this can still happen if this is being called from the system process,
|
||||
// so, better to log and return an empty bundle.
|
||||
Log.w(TAG, "respond() threw RemoteException, returning an empty bundle.", e);
|
||||
return Bundle.EMPTY;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user