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

Commit 200a65be authored by Tetsutoki Shiozawa's avatar Tetsutoki Shiozawa Committed by android-build-merger
Browse files

Merge "Fix: AccountManagerService crashed by accessing closed db" am: 6ac8f42d

am: 741736ca

Change-Id: Ic7ae1006f1650653d75685b5a6d5b22e74b8f950
parents 45e45558 741736ca
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -5087,10 +5087,18 @@ public class AccountManagerService
                logStatement.bindLong(4, callingUid);
                logStatement.bindString(5, tableName);
                logStatement.bindLong(6, userDebugDbInsertionPoint);
                try {
                    logStatement.execute();
                } catch (IllegalStateException e) {
                    // Guard against crash, DB can already be closed
                    // since this statement is executed on a handler thread
                    Slog.w(TAG, "Failed to insert a log record. accountId=" + accountId
                            + " action=" + action + " tableName=" + tableName + " Error: " + e);
                } finally {
                    logStatement.clearBindings();
                }
            }
        }

        LogRecordTask logTask = new LogRecordTask(action, tableName, accountId, userAccount,
                callingUid, userAccount.debugDbInsertionPoint);