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

Commit 0f957b13 authored by Lee Shombert's avatar Lee Shombert Committed by Automerger Merge Worker
Browse files

Merge "Do not disclose the database name in sqlite logs" into main am: 8d6e8297 am: 38c86766 

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



Change-Id: Ia864a77832eced2dc3c91628128db951187f9044
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f909a8f5 38c86766

core/java/android/database/sqlite/SQLiteConnection.java

+0 −2
Original line number Diff line number Diff line
@@ -392,8 +392,6 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen 
            return;

        }



        Log.i(TAG, walFile.getAbsolutePath() + " " + size + " bytes: Bigger than "

                + threshold + "; truncating");

        try {

            executeForString("PRAGMA wal_checkpoint(TRUNCATE)", null, null);

            mConfiguration.shouldTruncateWalFile = false;

core/java/android/database/sqlite/SQLiteOpenHelper.java

+1 −7
Original line number Diff line number Diff line
@@ -377,8 +377,7 @@ public abstract class SQLiteOpenHelper implements AutoCloseable { 
                    if (writable) {

                        throw ex;

                    }

                    Log.e(TAG, "Couldn't open " + mName

                            + " for writing (will try read-only):", ex);

                    Log.e(TAG, "Couldn't open database for writing (will try read-only):", ex);

                    params = params.toBuilder().addOpenFlags(SQLiteDatabase.OPEN_READONLY).build();

                    db = SQLiteDatabase.openDatabase(filePath, params);

                }
@@ -425,11 +424,6 @@ public abstract class SQLiteOpenHelper implements AutoCloseable { 
            }



            onOpen(db);



            if (db.isReadOnly()) {

                Log.w(TAG, "Opened " + mName + " in read-only mode");

            }



            mDatabase = db;

            return db;

        } finally {