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

Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb

Browse Source
This commit is contained in:
Vasu Nori
2011-01-07 12:40:16 -08:00
committed by Android (Google) Code Review
parent ccdf3853b5 324dbe508e
commit df22d839aa
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/database/sqlite/SQLiteCursor.java
View File

@@ -412,6 +412,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
db = mQuery.mDatabase.getDatabaseHandle(mQuery.mSql);
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
return false;
}
if (!db.equals(mQuery.mDatabase)) {
@@ -421,6 +422,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
db.lock();
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
return false;
}
try {
@@ -429,6 +431,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
mQuery = new SQLiteQuery(db, mQuery);
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
return false;
} finally {
db.unlock();
@@ -443,6 +446,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
mQuery.requery();
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
return false;
} finally {
queryThreadUnlock();
@@ -459,6 +463,7 @@ public class SQLiteCursor extends AbstractWindowedCursor {
result = super.requery();
} catch (IllegalStateException e) {
// for backwards compatibility, just return false
Log.w(TAG, "requery() failed " + e.getMessage(), e);
}
if (Config.LOGV) {
long timeEnd = System.currentTimeMillis();