summaryrefslogtreecommitdiffstats
path: root/core/java/android/database/sqlite/SQLiteCursor.java
diff options
context:
space:
mode:
authorVasu Nori <vnori@google.com>2011-03-18 11:40:37 -0700
committerVasu Nori <vnori@google.com>2011-03-18 16:10:39 -0700
commit16057fad00d47e920fc20721b70c7cafb765f7f8 (patch)
tree036d90affe9020985be0e1b966fd7aee92cfecae /core/java/android/database/sqlite/SQLiteCursor.java
parent5579bb75965eb72682cc4c12d26018e8c67b8133 (diff)
downloadframeworks_base-16057fad00d47e920fc20721b70c7cafb765f7f8.zip
frameworks_base-16057fad00d47e920fc20721b70c7cafb765f7f8.tar.gz
frameworks_base-16057fad00d47e920fc20721b70c7cafb765f7f8.tar.bz2
fix broken logTimeStat stuff
log time in the following 2 situations 1. all transactions. time measured = wall time between begin-commit 2. queries (which are not in tranactions) Change-Id: I67be9487a96072695aff3529ba4a257f4c8ec596
Diffstat (limited to 'core/java/android/database/sqlite/SQLiteCursor.java')
-rw-r--r--core/java/android/database/sqlite/SQLiteCursor.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/database/sqlite/SQLiteCursor.java b/core/java/android/database/sqlite/SQLiteCursor.java
index 4c2d123..83f3891 100644
--- a/core/java/android/database/sqlite/SQLiteCursor.java
+++ b/core/java/android/database/sqlite/SQLiteCursor.java
@@ -241,7 +241,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
mColumnNameMap = null;
mQuery = query;
- query.mDatabase.lock();
+ query.mDatabase.lock(query.mSql);
try {
// Setup the list of columns
int columnCount = mQuery.columnCountLocked();
@@ -419,7 +419,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
// since we need to use a different database connection handle,
// re-compile the query
try {
- db.lock();
+ db.lock(mQuery.mSql);
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);