commit eadd950b34239d41ba76fec77f7efbc9afbbf9a1
author Jonathan Scott <scottjonathan@google.com> Mon Jan 30 19:50:17 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 30 19:50:17 2023 +0000
tree e0f3f17b665e86ab0b2b451a808366a9f83f7e63
parent 68a80299e3a275cec358cec46d846309643f2023
parent 592cc0854517d5d9cc98dfdf89a0b2bcad025727

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

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

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index c9c9c55..9c64054 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -16363,7 +16363,9 @@
 
     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;