OSDN Git Service

Improve accessibility service detection to handle edge cases
authorBraden Farmer <farmerbb@gmail.com>
Sun, 4 Dec 2016 18:55:26 +0000 (11:55 -0700)
committerBraden Farmer <farmerbb@gmail.com>
Sun, 4 Dec 2016 18:55:26 +0000 (11:55 -0700)
app/src/main/java/com/farmerbb/taskbar/util/U.java

index f76f747..cad4e41 100644 (file)
@@ -151,7 +151,11 @@ public class U {
 
     private static boolean isAccessibilityServiceEnabled(Context context) {
         String accessibilityServices = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        return accessibilityServices != null && accessibilityServices.contains(PowerMenuService.class.getName());
+        ComponentName component = new ComponentName(context, PowerMenuService.class);
+
+        return accessibilityServices != null
+                && (accessibilityServices.contains(component.flattenToString())
+                || accessibilityServices.contains(component.flattenToShortString()));
     }
 
     public static void showToast(Context context, int message) {