Important: The file should be constructed either from an absolute path or + * by using {@link android.content.Context#getDatabasePath(String)}. * @param openParams configuration parameters that are used for opening {@link SQLiteDatabase} * @return the newly opened database * @throws SQLiteException if the database cannot be opened */ - public static SQLiteDatabase openDatabase(@NonNull String path, + public static SQLiteDatabase openDatabase(@NonNull File path, + @NonNull OpenParams openParams) { + return openDatabase(path.getPath(), openParams); + } + + private static SQLiteDatabase openDatabase(@NonNull String path, @NonNull OpenParams openParams) { Preconditions.checkArgument(openParams != null, "OpenParams cannot be null"); SQLiteDatabase db = new SQLiteDatabase(path, openParams.mOpenFlags, @@ -873,7 +880,8 @@ public final class SQLiteDatabase extends SQLiteClosable { * * @param factory an optional factory class that is called to instantiate a * cursor when query is called - * @return a SQLiteDatabase object, or null if the database can't be created + * @return a SQLiteDatabase instance + * @throws SQLiteException if the database cannot be created */ @NonNull public static SQLiteDatabase create(@Nullable CursorFactory factory) { @@ -889,7 +897,8 @@ public final class SQLiteDatabase extends SQLiteClosable { *
Sets the locale of the database to the the system's current locale. * Call {@link #setLocale} if you would like something else.
* @param openParams configuration parameters that are used for opening SQLiteDatabase - * @return a SQLiteDatabase object, or null if the database can't be created + * @return a SQLiteDatabase instance + * @throws SQLException if the database cannot be created */ @NonNull public static SQLiteDatabase createInMemory(@NonNull OpenParams openParams) { @@ -2322,7 +2331,7 @@ public final class SQLiteDatabase extends SQLiteClosable { } /** - * Returns flags to control database access mode + * Returns flags to control database access mode. Default value is 0. * * @see Builder#setOpenFlags(int) */ diff --git a/core/java/android/database/sqlite/SQLiteOpenHelper.java b/core/java/android/database/sqlite/SQLiteOpenHelper.java index dfaf714963ebe..cc9e0f4ded843 100644 --- a/core/java/android/database/sqlite/SQLiteOpenHelper.java +++ b/core/java/android/database/sqlite/SQLiteOpenHelper.java @@ -289,12 +289,12 @@ public abstract class SQLiteOpenHelper { } else if (mName == null) { db = SQLiteDatabase.createInMemory(mOpenParamsBuilder.build()); } else { - final String path = mContext.getDatabasePath(mName).getPath(); + final File filePath = mContext.getDatabasePath(mName); SQLiteDatabase.OpenParams params = mOpenParamsBuilder.build(); try { - db = SQLiteDatabase.openDatabase(path, params); + db = SQLiteDatabase.openDatabase(filePath, params); // Keep pre-O-MR1 behavior by resetting file permissions to 660 - setFilePermissionsForDb(path); + setFilePermissionsForDb(filePath.getPath()); } catch (SQLException ex) { if (writable) { throw ex; @@ -302,7 +302,7 @@ public abstract class SQLiteOpenHelper { Log.e(TAG, "Couldn't open " + mName + " for writing (will try read-only):", ex); params = params.toBuilder().addOpenFlags(SQLiteDatabase.OPEN_READONLY).build(); - db = SQLiteDatabase.openDatabase(path, params); + db = SQLiteDatabase.openDatabase(filePath, params); } } diff --git a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java index f97d51d3a38a9..335cea772a741 100644 --- a/core/tests/coretests/src/android/database/DatabaseGeneralTest.java +++ b/core/tests/coretests/src/android/database/DatabaseGeneralTest.java @@ -1058,7 +1058,7 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT mDatabase.close(); SQLiteDatabase.OpenParams params = new SQLiteDatabase.OpenParams.Builder() .setLookasideConfig(0, 0).build(); - mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile.getPath(), params); + mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile, params); verifyLookasideStats(true); } @@ -1193,7 +1193,7 @@ public class DatabaseGeneralTest extends AndroidTestCase implements PerformanceT mDatabase.close(); SQLiteDatabase.OpenParams params = new SQLiteDatabase.OpenParams.Builder() .setIdleConnectionTimeout(1000).build(); - mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile.getPath(), params); + mDatabase = SQLiteDatabase.openDatabase(mDatabaseFile, params); // Wait a bit and check that connection is still open Thread.sleep(100); String output = executeShellCommand("dumpsys dbinfo " + getContext().getPackageName());