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 am: ab8be59c13

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23057623

Change-Id: I6e4ff9e325e5b05d3f3b6d2f6de5ec2466da8073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kevin Jeon
2023-05-05 19:13:35 +00:00
committed by Automerger Merge Worker
parent 11668d837b ab8be59c13
commit 99d461b97c
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, " ");
synchronized (mLock) {
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();
printer.println("Connection pool for " + mConfiguration.path + ":");