Removing requirement for no enabled accessibility services

Now Launcher will talk to TAPL even if there are enabled accessibility
services.

This should fix some lab tests that presumably run with some
accessibility services enabled.

Bug: 110103162
Test: will check on lab tests
Change-Id: Ie11896441c2b2b7c16150cd3f2df28a5a5095d88

1 files changed, 1 insertions, 8 deletions

diff --git a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
index 32fb5332c..3b0226e1c 100644
--- a/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
+++ b/src/com/android/launcher3/compat/AccessibilityManagerCompat.java
@@ -16,7 +16,6 @@
 
 package com.android.launcher3.compat;
 
-import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
@@ -78,14 +77,8 @@ public class AccessibilityManagerCompat {
         // If not running in a test harness, don't participate in test exchanges.
         if (!Utilities.IS_RUNNING_IN_TEST_HARNESS) return null;
 
-        // Additional safety check: when running under UI Automation, accessibility is enabled,
-        // but the list of accessibility services is empty. Return null if this is not the case.
         final AccessibilityManager accessibilityManager = getManager(context);
-        if (!accessibilityManager.isEnabled() ||
-                accessibilityManager.getEnabledAccessibilityServiceList(
-                        AccessibilityServiceInfo.FEEDBACK_ALL_MASK).size() > 0) {
-            return null;
-        }
+        if (!accessibilityManager.isEnabled()) return null;
 
         return accessibilityManager;
     }