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

Merge "Include additional information in the dumpsys" into pi-dev

Browse Source
This commit is contained in:
Fyodor Kupolov
2018-03-21 17:25:28 +00:00
committed by Android (Google) Code Review
parent 158a18108b 681ec3128e
commit 38e09dd7e1
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,9 +293,7 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
(mConfiguration.openFlags & SQLiteDatabase.ENABLE_WRITE_AHEAD_LOGGING) != 0;
// Use compatibility WAL unless an app explicitly set journal/synchronous mode
// or DISABLE_COMPATIBILITY_WAL flag is set
final boolean useCompatibilityWal = mConfiguration.journalMode == null
&& mConfiguration.syncMode == null
&& (mConfiguration.openFlags & SQLiteDatabase.DISABLE_COMPATIBILITY_WAL) == 0;
final boolean useCompatibilityWal = mConfiguration.useCompatibilityWal();
if (walEnabled || useCompatibilityWal) {
setJournalMode("WAL");
if (useCompatibilityWal && SQLiteCompatibilityWalFlags.areFlagsSet()) {

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

@@ -23,6 +23,7 @@ import android.os.Looper;
import android.os.Message;
import android.os.OperationCanceledException;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
import android.util.PrefixPrinter;
import android.util.Printer;
@@ -1111,6 +1112,11 @@ public final class SQLiteConnectionPool implements Closeable {
printer.println(" Open: " + mIsOpen);
printer.println(" Max connections: " + mMaxConnectionPoolSize);
printer.println(" Total execution time: " + mTotalExecutionTimeCounter);
printer.println(" Configuration: openFlags=" + mConfiguration.openFlags
+ ", useCompatibilityWal=" + mConfiguration.useCompatibilityWal()
+ ", journalMode=" + TextUtils.emptyIfNull(mConfiguration.journalMode)
+ ", syncMode=" + TextUtils.emptyIfNull(mConfiguration.syncMode));
if (SQLiteCompatibilityWalFlags.areFlagsSet()) {
printer.println(" Compatibility WAL settings: compatibility_wal_supported="
+ SQLiteCompatibilityWalFlags

5
core/java/android/database/sqlite/SQLiteDatabaseConfiguration.java
View File

@@ -194,6 +194,11 @@ public final class SQLiteDatabaseConfiguration {
return path.equalsIgnoreCase(MEMORY_DB_PATH);
}
boolean useCompatibilityWal() {
return journalMode == null && syncMode == null
&& (openFlags & SQLiteDatabase.DISABLE_COMPATIBILITY_WAL) == 0;
}
private static String stripPathForLogs(String path) {
if (path.indexOf('@') == -1) {
return path;