From ce25ed2994413c8985cf2a8b047b079d5208a53a Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Thu, 4 May 2017 11:44:31 -0700
Subject: [PATCH] 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
---
 .../android/server/accounts/AccountManagerService.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 03da5b21fef8b..2bd55e2a892a6 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 @@ public class AccountManagerService
         }
 
         @Override
-        public void onCleanupUser(int userHandle) {
-            mService.onCleanupUser(userHandle);
+        public void onStopUser(int userHandle) {
+            mService.onStopUser(userHandle);
         }
     }
 
@@ -1360,8 +1360,8 @@ public class AccountManagerService
     }
 
 
-    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);