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

Merge "Ignore exceptions when investigating failure reasons" into rvc-dev am: d907c49479 am: f37ded68ae

Browse Source 
Change-Id: Iebd2c7130bc80bd3507daab6a6c345eeeab7fbda
This commit is contained in:
TreeHugger Robot
2020-04-21 22:30:08 +00:00
committed by Automerger Merge Worker
parent 2ab400720a f37ded68ae
commit 397f577531
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,6 +228,10 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
} catch (SQLiteCantOpenDatabaseException e) { } catch (SQLiteCantOpenDatabaseException e) {
String message = String.format("Cannot open database '%s'", file); String message = String.format("Cannot open database '%s'", file);
try {
// Try to diagnose for common reasons. If something fails in here, that's fine;
// just swallow the exception.
final Path path = FileSystems.getDefault().getPath(file); final Path path = FileSystems.getDefault().getPath(file);
final Path dir = path.getParent(); final Path dir = path.getParent();
@@ -242,6 +246,9 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen
} else { } else {
message += ": Unknown reason"; message += ": Unknown reason";
} }
} catch (Throwable th) {
message += ": Unknown reason; cannot examine filesystem: " + th.getMessage();
}
throw new SQLiteCantOpenDatabaseException(message, e); throw new SQLiteCantOpenDatabaseException(message, e);
} finally { } finally {
mRecentOperations.endOperation(cookie); mRecentOperations.endOperation(cookie);