Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo

Browse Source
This commit is contained in:
Vasu Nori
2010-04-28 15:35:57 -07:00
committed by Android (Google) Code Review
parent 6e4895b63a 020e534579
commit a07c4cbea9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/ContentResolver.java
View File

@@ -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

6
core/java/android/database/sqlite/SQLiteDatabase.java
View File

@@ -1341,18 +1341,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;