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

Merge "when printing requery on UI warning, include additional info"

Browse Source
This commit is contained in:
Vasu Nori
2010-10-08 14:50:59 -07:00
committed by Android (Google) Code Review
parent 8163315095 f0808f810e
commit ee7e28e20d
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,8 +416,10 @@ public class SQLiteCursor extends AbstractWindowedCursor {
// BEGIN STOPSHIP remove the following line
t = new RequeryOnUiThreadException(packageName);
// END STOPSHIP
Log.w(TAG, "should not attempt requery on main (UI) thread: app = " +
packageName == null ? "'unknown'" : packageName, t);
String s = packageName == null ? "'unknown'" : packageName;
Log.w(TAG, "should not attempt requery on main (UI) thread: app = " + s +
" (database: " + mQuery.mDatabase.getPath() +
", query: " + mQuery.mSql + ")", t);
}
}
}

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

@@ -2114,7 +2114,14 @@ public class SQLiteDatabase extends SQLiteClosable {
return;
}
if (!mCacheFullWarning && mCompiledQueries.size() == mMaxSqlCacheSize) {
int maxCacheSz = (mConnectionNum == 0) ? mMaxSqlCacheSize :
mParentConnObj.mMaxSqlCacheSize;
boolean printWarning =
(mConnectionNum == 0)
? (!mCacheFullWarning && mCompiledQueries.size() == maxCacheSz)
: (!mParentConnObj.mCacheFullWarning &&
mParentConnObj.mCompiledQueries.size() == maxCacheSz);
if (printWarning) {
/*
* cache size of {@link #mMaxSqlCacheSize} is not enough for this app.
* log a warning.