diff options
| author | Vasu Nori <vnori@google.com> | 2011-01-07 12:40:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-07 12:40:16 -0800 |
| commit | df22d839aa1268a8137cadb4f036fd88946aa112 (patch) | |
| tree | 0bef64a1fc16bb46c5ab85e7121a5deaa86a58b0 | |
| parent | ccdf3853b505f56a8bc52ee038dfe07aa87eb088 (diff) | |
| parent | 324dbe508e7afdae201fe378f1aca4227baf6c06 (diff) | |
| download | frameworks_base-df22d839aa1268a8137cadb4f036fd88946aa112.zip frameworks_base-df22d839aa1268a8137cadb4f036fd88946aa112.tar.gz frameworks_base-df22d839aa1268a8137cadb4f036fd88946aa112.tar.bz2 | |
Merge "in requery(), when exception is caught, print warning + stacktrace" into honeycomb
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteCursor.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/database/sqlite/SQLiteCursor.java b/core/java/android/database/sqlite/SQLiteCursor.java index 26a1440..4c2d123 100644 --- a/core/java/android/database/sqlite/SQLiteCursor.java +++ b/core/java/android/database/sqlite/SQLiteCursor.java @@ -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(); |