Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d461b9 authored by Kevin Jeon's avatar Kevin Jeon Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I6e4ff9e325e5b05d3f3b6d2f6de5ec2466da8073
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11668d83 ab8be59c

core/java/android/database/sqlite/SQLiteConnectionPool.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -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 + ":");