Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enhance exception message on SQLiteCantOpenDatabaseException" into rvc-dev am: bc98d3edb0

Browse Source 
Change-Id: Ic1c9fd6235afcc3ce84c7ac27f993348707e876b
This commit is contained in:
TreeHugger Robot
2020-04-09 13:09:20 +00:00
committed by Automerger Merge Worker
parent e3579901db bc98d3edb0
commit 40a3d41725
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/database/sqlite/SQLiteCantOpenDatabaseException.java
View File

@@ -22,4 +22,9 @@ public class SQLiteCantOpenDatabaseException extends SQLiteException {
public SQLiteCantOpenDatabaseException(String error) {
super(error);
}
/** @hide */
public SQLiteCantOpenDatabaseException(String error, Throwable cause) {
super(error, cause);
}
}

24
core/java/android/database/sqlite/SQLiteConnection.java
View File

@@ -36,6 +36,9 @@ import dalvik.system.CloseGuard;
import java.io.File;
import java.io.IOException;
import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -215,12 +218,31 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
}
private void open() {
final String file = mConfiguration.path;
final int cookie = mRecentOperations.beginOperation("open", null, null);
try {
mConnectionPtr = nativeOpen(mConfiguration.path, mConfiguration.openFlags,
mConnectionPtr = nativeOpen(file, mConfiguration.openFlags,
mConfiguration.label,
NoPreloadHolder.DEBUG_SQL_STATEMENTS, NoPreloadHolder.DEBUG_SQL_TIME,
mConfiguration.lookasideSlotSize, mConfiguration.lookasideSlotCount);
} catch (SQLiteCantOpenDatabaseException e) {
String message = String.format("Cannot open database '%s'", file);
final Path path = FileSystems.getDefault().getPath(file);
final Path dir = path.getParent();
if (!Files.isDirectory(dir)) {
message += ": Directory " + dir + " doesn't exist";
} else if (!Files.exists(path)) {
message += ": File " + path + " doesn't exist";
} else if (!Files.isReadable(path)) {
message += ": File " + path + " is not readable";
} else if (Files.isDirectory(path)) {
message += ": Path " + path + " is a directory";
} else {
message += ": Unknown reason";
}
throw new SQLiteCantOpenDatabaseException(message, e);
} finally {
mRecentOperations.endOperation(cookie);
}