diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 13:04:50 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 13:04:50 -0700 |
commit | ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc (patch) | |
tree | f6f12d7ea6b7323811e65c6b1cf40b979b43484e /core/java/android/database | |
parent | 9f79975fa03311dd682611d743e9257654d85c59 (diff) | |
parent | eb717b9c4337e5b88664802b0804f4cb48758120 (diff) | |
download | frameworks_base-ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc.zip frameworks_base-ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc.tar.gz frameworks_base-ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc.tar.bz2 |
am eb717b9c: Merge change 4477 into donut
Merge commit 'eb717b9c4337e5b88664802b0804f4cb48758120'
* commit 'eb717b9c4337e5b88664802b0804f4cb48758120':
BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
Diffstat (limited to 'core/java/android/database')
-rw-r--r-- | core/java/android/database/BulkCursorToCursorAdaptor.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/database/BulkCursorToCursorAdaptor.java b/core/java/android/database/BulkCursorToCursorAdaptor.java index c26810a..cf30dd9 100644 --- a/core/java/android/database/BulkCursorToCursorAdaptor.java +++ b/core/java/android/database/BulkCursorToCursorAdaptor.java @@ -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; } } } |