Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb717b9c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 4477 into donut

* changes:
  BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
parents ecfb9f91 6dc0ef00
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -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;
        }
    }
}