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

Commit 58903605 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Ignore exceptions when investigating failure reasons 

Fix: 154428500
Test: boot
Test: code inspection
Change-Id: I2a69a58aaa43617f40bc52fd06cba730faa93672
parent ce316be9

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

+20 −13
Original line number Diff line number Diff line
@@ -228,6 +228,10 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen 
        } catch (SQLiteCantOpenDatabaseException e) {

            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 dir = path.getParent();
@@ -242,6 +246,9 @@ public final class SQLiteConnection implements CancellationSignal.OnCancelListen 
                } else {

                    message += ": Unknown reason";

                }

            } catch (Throwable th) {

                message += ": Unknown reason; cannot examine filesystem: " + th.getMessage();

            }

            throw new SQLiteCantOpenDatabaseException(message, e);

        } finally {

            mRecentOperations.endOperation(cookie);