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

Commit eadd950b authored by Jonathan Scott's avatar Jonathan Scott Committed by Android (Google) Code Review
Browse files

Merge "Remove blocking call on binder thread to check account features."

parents 68a80299 592cc085

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

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
















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







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











        try {







        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) {







        } catch (Exception e) {











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







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











            return false;







            return false;