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

Commit 592cc085 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

Remove blocking call on binder thread to check account features. 

Until this check is restored it will mean we cannot set test DeviceOwner
on devices which have pre-configured Accounts.

I will follow up with accounts team to find a more performant solution.

Test: atest CtsDevicePolicyTestCases
Bug: 261552303
Change-Id: Icae7b6d2f22c632e6fb7d5223e2e10b0773cea02
parent 0e7f993d

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -16363,7 +16363,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














    private boolean hasAccountFeatures(AccountManager am, Account account, String[] features) {















        try {













            return am.hasFeatures(account, features, null, null).getResult();













            // TODO(267156507): Restore without blocking binder thread













            return false;













//            return am.hasFeatures(account, features, null, null).getResult();















        } catch (Exception e) {















            Slogf.w(LOG_TAG, "Failed to get account feature", e);















            return false;