commit 1cf3e8e6b4b11b5a1b4e2ba3538308c77c58367b
author Dmitry Dementyev <dementyev@google.com> Mon May 13 11:01:54 2024 -0700
committer Dmitry Dementyev <dementyev@google.com> Mon May 13 11:10:19 2024 -0700
tree 5665e3c2dab35eb5c91402230f81f6e538caa484
parent 61b0874b01c7209702f6547c89acb6443ddc3bb7

Return empty list if getAccounts is called for removed user.

This will prevent crash in DevicePolicyManagerService.

Bug: 339720160
Test: atest AccountManagerTest
Change-Id: I0abc587ded128e770975724b0a1f042ffb724ce3

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 1015ad9..ac9ed0d 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4532,8 +4532,13 @@
     public Account[] getAccountsAsUser(String type, int userId, String opPackageName) {
         int callingUid = Binder.getCallingUid();
         mAppOpsManager.checkPackage(callingUid, opPackageName);
-        return getAccountsAsUserForPackage(type, userId, opPackageName /* callingPackage */, -1,
-                opPackageName, false /* includeUserManagedNotVisible */);
+        try {
+            return getAccountsAsUserForPackage(type, userId, opPackageName /* callingPackage */, -1,
+                    opPackageName, false /* includeUserManagedNotVisible */);
+        } catch (SQLiteCantOpenDatabaseException e) {
+            Log.e(TAG, "Could not get accounts for user " + userId, e);
+            return new Account[]{};
+        }
     }
 
     @NonNull