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

Commit 1a2344b8 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 09e50cdb: Merge "Reorder lock acquision vs try." 

* commit '09e50cdb':
  Reorder lock acquision vs try.
parents 7ee42771 09e50cdb

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

+5 −6
Original line number Diff line number Diff line
@@ -132,11 +132,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 = mQuery.fillWindow(cw, mMaxRead, mCount);

                    // return -1 means not finished

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

        mQuery = query;



        try {

        db.lock();



        try {

            // Setup the list of columns

            int columnCount = mQuery.columnCountLocked();

            mColumns = new String[columnCount];