diff options
| -rw-r--r-- | config/preloaded-classes | 1 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteConnection.java | 8 | ||||
| -rw-r--r-- | core/java/android/database/sqlite/SQLiteDebug.java | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/config/preloaded-classes b/config/preloaded-classes index 91cb47bd0200..b4fd031bf5a2 100644 --- a/config/preloaded-classes +++ b/config/preloaded-classes @@ -1105,7 +1105,6 @@ android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabaseConfiguration android.database.sqlite.SQLiteDatabaseCorruptException android.database.sqlite.SQLiteDatabaseLockedException -android.database.sqlite.SQLiteDebug$Consts android.database.sqlite.SQLiteDebug$DbStats android.database.sqlite.SQLiteDebug$PagerStats android.database.sqlite.SQLiteDebug diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java index 3844794da980..f7222750b89b 100644 --- a/core/java/android/database/sqlite/SQLiteConnection.java +++ b/core/java/android/database/sqlite/SQLiteConnection.java @@ -19,8 +19,8 @@ package android.database.sqlite; import android.database.Cursor; import android.database.CursorWindow; import android.database.DatabaseUtils; -import android.database.sqlite.SQLiteDebug.Consts; import android.database.sqlite.SQLiteDebug.DbStats; +import android.database.sqlite.SQLiteDebug.NoPreloadHolder; import android.os.CancellationSignal; import android.os.OperationCanceledException; import android.os.ParcelFileDescriptor; @@ -214,7 +214,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen try { mConnectionPtr = nativeOpen(mConfiguration.path, mConfiguration.openFlags, mConfiguration.label, - SQLiteDebug.Consts.DEBUG_SQL_STATEMENTS, SQLiteDebug.Consts.DEBUG_SQL_TIME, + NoPreloadHolder.DEBUG_SQL_STATEMENTS, NoPreloadHolder.DEBUG_SQL_TIME, mConfiguration.lookasideSlotSize, mConfiguration.lookasideSlotCount); } finally { mRecentOperations.endOperation(cookie); @@ -1500,7 +1500,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen operation.mFinished = true; final long execTime = operation.mEndTime - operation.mStartTime; mPool.onStatementExecuted(execTime); - return SQLiteDebug.Consts.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery( + return NoPreloadHolder.DEBUG_LOG_SLOW_QUERIES && SQLiteDebug.shouldLogSlowQuery( execTime); } return false; @@ -1608,7 +1608,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen if (mSql != null) { msg.append(", sql=\"").append(trimSqlForDisplay(mSql)).append("\""); } - final boolean dumpDetails = allowDetailedLog && Consts.DEBUG_LOG_DETAILED + final boolean dumpDetails = allowDetailedLog && NoPreloadHolder.DEBUG_LOG_DETAILED && mBindArgs != null && mBindArgs.size() != 0; if (dumpDetails) { msg.append(", bindArgs=["); diff --git a/core/java/android/database/sqlite/SQLiteDebug.java b/core/java/android/database/sqlite/SQLiteDebug.java index 4fc7f5d257a9..a231a920a29b 100644 --- a/core/java/android/database/sqlite/SQLiteDebug.java +++ b/core/java/android/database/sqlite/SQLiteDebug.java @@ -39,7 +39,7 @@ public final class SQLiteDebug { * * {@hide} */ - public static final class Consts { + public static final class NoPreloadHolder { /** * Controls the printing of informational SQL log messages. * @@ -103,8 +103,9 @@ public final class SQLiteDebug { */ public static boolean shouldLogSlowQuery(long elapsedTimeMillis) { final int slowQueryMillis = Math.min( - SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_PROP, Integer.MAX_VALUE), - SystemProperties.getInt(Consts.SLOW_QUERY_THRESHOLD_UID_PROP, + SystemProperties.getInt(NoPreloadHolder.SLOW_QUERY_THRESHOLD_PROP, + Integer.MAX_VALUE), + SystemProperties.getInt(NoPreloadHolder.SLOW_QUERY_THRESHOLD_UID_PROP, Integer.MAX_VALUE)); return elapsedTimeMillis >= slowQueryMillis; } |