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

Commit 6343b32a authored by Phil Weaver's avatar Phil Weaver
Browse files

Make equality check more robust for a11y button 

Fixes: 72734254
Test: "adb shell settings put secure
accessibility_button_target_component blah" no longer
crashes.

Change-Id: I1c8b56386c135f111a8f5ab3f5b76d2991a6c5a1
parent d7551607

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ import java.util.HashSet; 
import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.Set;

import java.util.function.Consumer;

import java.util.function.IntSupplier;
@@ -2055,7 +2056,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        }



        ComponentName componentName = ComponentName.unflattenFromString(componentId);

        if (componentName.equals(userState.mServiceAssignedToAccessibilityButton)) {

        if (Objects.equals(componentName, userState.mServiceAssignedToAccessibilityButton)) {

            return false;

        }

        userState.mServiceAssignedToAccessibilityButton = componentName;