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

Merge "Add null check to SQLiteConnectionPool.dump()" into udc-dev

Browse Source
This commit is contained in:
Kevin Jeon
2023-05-05 18:53:28 +00:00
committed by Android (Google) Code Review
parent 7165756cc4 68304252b7
commit ab8be59c13
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1136,7 +1136,10 @@ public final class SQLiteConnectionPool implements Closeable {
Printer indentedPrinter = PrefixPrinter.create(printer, " "); Printer indentedPrinter = PrefixPrinter.create(printer, " ");
synchronized (mLock) { synchronized (mLock) {
if (directories != null) { if (directories != null) {
directories.add(new File(mConfiguration.path).getParent()); String parent = new File(mConfiguration.path).getParent();
if (parent != null) {
directories.add(parent);
}
} }
boolean isCompatibilityWalEnabled = mConfiguration.isLegacyCompatibilityWalEnabled(); boolean isCompatibilityWalEnabled = mConfiguration.isLegacyCompatibilityWalEnabled();
printer.println("Connection pool for " + mConfiguration.path + ":"); printer.println("Connection pool for " + mConfiguration.path + ":");