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

Commit ffe4ddfe authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am eb717b9c: Merge change 4477 into donut 

Merge commit 'eb717b9c'

* commit 'eb717b9c':
  BulkCursorToCursorAdaptor.respond no longer assumes RemoteException is impossible, fails more gracefully.
parents 9f79975f eb717b9c

core/java/android/database/BulkCursorToCursorAdaptor.java

+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;

        }

    }

}