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

Commit 70bced64 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Catch SQLiteFullException in AccountManagerService" am: 74d1d270 am: ff4dc182 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733493

Change-Id: I3816e6d03ea9fb8d7817eabae0c5a63054a21567
parents 507ff5a3 ff4dc182

services/core/java/com/android/server/accounts/AccountManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.content.pm.ResolveInfo; 
import android.content.pm.Signature;

import android.content.pm.UserInfo;

import android.database.Cursor;

import android.database.sqlite.SQLiteFullException;

import android.database.sqlite.SQLiteStatement;

import android.os.Binder;

import android.os.Bundle;
@@ -5236,7 +5237,7 @@ public class AccountManagerService 
                    logStatement.bindLong(6, userDebugDbInsertionPoint);

                    try {

                        logStatement.execute();

                    } catch (IllegalStateException e) {

                    } catch (IllegalStateException | SQLiteFullException 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