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

Commit 5253dcb1 authored by Lee Shombert's avatar Lee Shombert
Browse files

Correct SQLiteOpenHelper lock creation 

This changes SQLiteOpenHelper to synchronize on the raw name of the
database instead of on the canonical file path.

It is possible for an app to create an open helper with two different
db paths that map to the same file on disk; in that case
SQLiteOpenHelper remains thread-unsafe.

Flag: android.database.sqlite.concurrent_open_helper
Bug: 335904370
Bug: 390061581
Test: atest
 * CtsDatabaseTestCases
 * FrameworksCoreTests:android.database
 * CellBroadcastReceiverMTS
Change-Id: I084942d73bdba0adf5a7634b8378e9b397fcc5fa
parent dd4984e9

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

+2 −9
Original line number Diff line number Diff line
@@ -182,17 +182,10 @@ public abstract class SQLiteOpenHelper implements AutoCloseable { 
        setOpenParamsBuilder(openParamsBuilder);



        Object lock = null;

        if (mName == null || !Flags.concurrentOpenHelper()) {

        if (!Flags.concurrentOpenHelper() || mName == null) {

            lock = new Object();

        } else {

            try {

                final String path = mContext.getDatabasePath(mName).getCanonicalPath();

                lock = sDbLock.computeIfAbsent(path, (String k) -> new Object());

            } catch (IOException e) {

                Log.d(TAG, "failed to construct db path for " + mName);

                // Ensure the lock is not null.

                lock = new Object();

            }

            lock = sDbLock.computeIfAbsent(mName, (String k) -> new Object());

        }

        mLock = lock;

    }