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

Commit 0d9b02c4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 1a2344b8 to master"

parents 04cdb78c 8565a8eb

core/java/android/database/sqlite/SQLiteCursor.java

+5 −6
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ public class SQLiteCursor extends AbstractWindowedCursor { 
            // the cursor's state doesn't change

            while (true) {

                mLock.lock();

                try {

                    if (mCursorState != mThreadState) {

                    mLock.unlock();

                        break;

                    }

                try {



                    int count = getQuery().fillWindow(cw, mMaxRead, mCount);

                    // return -1 means there is still more data to be retrieved from the resultset

                    if (count != 0) {
@@ -241,9 +241,8 @@ public class SQLiteCursor extends AbstractWindowedCursor { 
        mColumnNameMap = null;

        mQuery = query;



        try {

        query.mDatabase.lock();



        try {

            // Setup the list of columns

            int columnCount = mQuery.columnCountLocked();

            mColumns = new String[columnCount];