commit ce25ed2994413c8985cf2a8b047b079d5208a53a
author Fyodor Kupolov <fkupolov@google.com> Thu May 04 11:44:31 2017 -0700
committer Fyodor Kupolov <fkupolov@google.com> Thu May 04 11:44:31 2017 -0700
tree de8ab7e651c844958a85abc90a3479b7e7f3436c
parent 5fafafaba26c2a451e209a5b2da9c05c4b7c8201

Close databases in onStop user

The key is evicted before onCleanup. To be safe we should close db in
onStopUser while the key is still available

Test: switch to u10, switch to u0, am stop-user 10, am switch-user 10
Bug: 37781320
Change-Id: Iab18c503a236a15833974b0dad2af6eed86a6c02

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 03da5b2..2bd55e2 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -158,8 +158,8 @@
         }
 
         @Override
-        public void onCleanupUser(int userHandle) {
-            mService.onCleanupUser(userHandle);
+        public void onStopUser(int userHandle) {
+            mService.onStopUser(userHandle);
         }
     }
 
@@ -1360,8 +1360,8 @@
     }
 
 
-    private void onCleanupUser(int userId) {
-        Log.i(TAG, "onCleanupUser " + userId);
+    private void onStopUser(int userId) {
+        Log.i(TAG, "onStopUser " + userId);
         UserAccounts accounts;
         synchronized (mUsers) {
             accounts = mUsers.get(userId);