commit 741736cafa88d9101654b74074de46405718d1ce
author Tetsutoki Shiozawa <tetsutoki.shiozawa@sony.com> Fri Oct 27 18:53:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 27 18:53:20 2017 +0000
tree 7287c64924c4029f133a7f1d86b6556f0e897c6d
parent a096e8d1774d1ebdf3c7a290e50f28520002214e
parent 6ac8f42d9ea1388f20400f7609b62d858ef6b7a9

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

Change-Id: I35f289e43a7406087a13258b5e6cbf5e179dc529

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

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index f82eb1f..86ce12e 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -5068,8 +5068,16 @@
                 logStatement.bindLong(4, callingUid);
                 logStatement.bindString(5, tableName);
                 logStatement.bindLong(6, userDebugDbInsertionPoint);
-                logStatement.execute();
-                logStatement.clearBindings();
+                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();
+                }
             }
         }