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

Commit 1f83c646 authored by Elis Elliott's avatar Elis Elliott
Browse files

Add timeout to AccountManager#hasFeatures check in DPMS. 

Fixes: 306267638

Test: btest CtsDevicePolicyTestCases
Change-Id: Id9b3ef766a5c107768b9fbc44a6768f8288090f7
parent 2c1ccb5a

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

+2 −1
Original line number Diff line number Diff line
@@ -18162,7 +18162,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        private static boolean hasAccountFeatures(AccountManager am, Account account,

                String[] features) {

            try {

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

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

                        .getResult(30, TimeUnit.SECONDS);

            } catch (Exception e) {

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

                return false;