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

am c3112608: Merge "Don\'t dump sql bindargs unless verbose mode is requested." into jb-mr2-dev

Browse Source 
* commit 'c31126088fea61a9b5ba6cdb1fd2791e86800a8a':
  Don't dump sql bindargs unless verbose mode is requested.
This commit is contained in:
Jeff Brown
2013-05-01 17:54:34 -07:00
committed by Android Git Automerger
parent bd5fca23e1 c31126088f
commit f2930d783a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/database/sqlite/SQLiteConnection.java
View File

@@ -1077,7 +1077,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
printer.println(" isPrimaryConnection: " + mIsPrimaryConnection); printer.println(" isPrimaryConnection: " + mIsPrimaryConnection);
printer.println(" onlyAllowReadOnlyOperations: " + mOnlyAllowReadOnlyOperations); printer.println(" onlyAllowReadOnlyOperations: " + mOnlyAllowReadOnlyOperations);
mRecentOperations.dump(printer); mRecentOperations.dump(printer, verbose);
if (verbose) { if (verbose) {
mPreparedStatementCache.dump(printer); mPreparedStatementCache.dump(printer);
@@ -1376,7 +1376,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
private void logOperationLocked(int cookie, String detail) { private void logOperationLocked(int cookie, String detail) {
final Operation operation = getOperationLocked(cookie); final Operation operation = getOperationLocked(cookie);
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
operation.describe(msg); operation.describe(msg, false);
if (detail != null) { if (detail != null) {
msg.append(", ").append(detail); msg.append(", ").append(detail);
} }
@@ -1399,14 +1399,14 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
final Operation operation = mOperations[mIndex]; final Operation operation = mOperations[mIndex];
if (operation != null && !operation.mFinished) { if (operation != null && !operation.mFinished) {
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
operation.describe(msg); operation.describe(msg, false);
return msg.toString(); return msg.toString();
} }
return null; return null;
} }
} }
public void dump(Printer printer) { public void dump(Printer printer, boolean verbose) {
synchronized (mOperations) { synchronized (mOperations) {
printer.println(" Most recently executed operations:"); printer.println(" Most recently executed operations:");
int index = mIndex; int index = mIndex;
@@ -1418,7 +1418,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
msg.append(" ").append(n).append(": ["); msg.append(" ").append(n).append(": [");
msg.append(operation.getFormattedStartTime()); msg.append(operation.getFormattedStartTime());
msg.append("] "); msg.append("] ");
operation.describe(msg); operation.describe(msg, verbose);
printer.println(msg.toString()); printer.println(msg.toString());
if (index > 0) { if (index > 0) {
@@ -1449,7 +1449,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
public Exception mException; public Exception mException;
public int mCookie; public int mCookie;
public void describe(StringBuilder msg) { public void describe(StringBuilder msg, boolean verbose) {
msg.append(mKind); msg.append(mKind);
if (mFinished) { if (mFinished) {
msg.append(" took ").append(mEndTime - mStartTime).append("ms"); msg.append(" took ").append(mEndTime - mStartTime).append("ms");
@@ -1461,7 +1461,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
if (mSql != null) { if (mSql != null) {
msg.append(", sql=\"").append(trimSqlForDisplay(mSql)).append("\""); msg.append(", sql=\"").append(trimSqlForDisplay(mSql)).append("\"");
} }
if (mBindArgs != null && mBindArgs.size() != 0) { if (verbose && mBindArgs != null && mBindArgs.size() != 0) {
msg.append(", bindArgs=["); msg.append(", bindArgs=[");
final int count = mBindArgs.size(); final int count = mBindArgs.size();
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {