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

Commit 1cf3e8e6 authored by Dmitry Dementyev's avatar Dmitry Dementyev
Browse files

Return empty list if getAccounts is called for removed user. 

This will prevent crash in DevicePolicyManagerService.

Bug: 339720160
Test: atest AccountManagerTest
Change-Id: I0abc587ded128e770975724b0a1f042ffb724ce3
parent 61b0874b

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

+7 −2
Original line number Diff line number Diff line
@@ -4532,8 +4532,13 @@ public class AccountManagerService 
    public Account[] getAccountsAsUser(String type, int userId, String opPackageName) {

        int callingUid = Binder.getCallingUid();

        mAppOpsManager.checkPackage(callingUid, opPackageName);

        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