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

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

am df22d839: Merge "in requery(), when exception is caught, print warning +... 

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

* commit 'df22d839':
  in requery(), when exception is caught, print warning + stacktrace
parents ec2e0184 df22d839

core/java/android/database/sqlite/SQLiteCursor.java

+5 −0
Original line number Diff line number Diff line
@@ -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();