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

Commit ca3a7b9b authored by Vasu Nori's avatar Vasu Nori Committed by Android Git Automerger
Browse files

am 43f2c35b: am 91a62f3d: am a07c4cbe: Merge "bug:2622719 move \'forcing of... 

am 43f2c35b: am 91a62f3d: am a07c4cbe: Merge "bug:2622719  move \'forcing of cursor execution\' to ContentProvider" into froyo
parents 6ef7677e 43f2c35b

core/java/android/content/ContentResolver.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,8 @@ public abstract class ContentResolver { 
                releaseProvider(provider);

                releaseProvider(provider);

                return null;

                return null;

            }

            }

            // force query execution

            qCursor.getCount();

            long durationMillis = SystemClock.uptimeMillis() - startTime;

            long durationMillis = SystemClock.uptimeMillis() - startTime;

            maybeLogQueryToEventLog(durationMillis, uri, projection, selection, sortOrder);

            maybeLogQueryToEventLog(durationMillis, uri, projection, selection, sortOrder);

            // Wrap the cursor object into CursorWrapperInner object

            // Wrap the cursor object into CursorWrapperInner object

core/java/android/database/sqlite/SQLiteDatabase.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -1385,18 +1385,18 @@ public class SQLiteDatabase extends SQLiteClosable { 
        SQLiteCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, editTable);

        SQLiteCursorDriver driver = new SQLiteDirectCursorDriver(this, sql, editTable);





        Cursor cursor = null;

        Cursor cursor = null;

        int count = 0;

        try {

        try {

            cursor = driver.query(

            cursor = driver.query(

                    cursorFactory != null ? cursorFactory : mFactory,

                    cursorFactory != null ? cursorFactory : mFactory,

                    selectionArgs);

                    selectionArgs);

        } finally {

            if (Config.LOGV || mSlowQueryThreshold != -1) {





                // Force query execution

                // Force query execution

                int count = -1;

                if (cursor != null) {

                if (cursor != null) {

                    count = cursor.getCount();

                    count = cursor.getCount();

                }

                }

        } finally {

            if (Config.LOGV || mSlowQueryThreshold != -1) {





                long duration = System.currentTimeMillis() - timeStart;

                long duration = System.currentTimeMillis() - timeStart;