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

Commit 2674eb91 authored by Yifei Zhang's avatar Yifei Zhang Committed by Android (Google) Code Review
Browse files

Merge "talkback: add null check to ComponentName" into main

parents d9ce70c1 c07fcd57

services/core/java/com/android/server/policy/TalkbackShortcutController.java

+5 −1
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ class TalkbackShortcutController { 
        final Set<ComponentName> enabledServices =

                AccessibilityUtils.getEnabledServicesFromSettings(mContext, userId);

        ComponentName componentName = getTalkbackComponent();

        if (componentName == null) {

            return false;

        }



        boolean isTalkbackAlreadyEnabled = enabledServices.contains(componentName);



        if (isTalkBackShortcutGestureEnabled()) {
@@ -67,7 +71,7 @@ class TalkbackShortcutController { 
                    isTalkbackAlreadyEnabled);



            // log stem triple press telemetry if it's a talkback enabled event.

            if (componentName != null && isTalkbackAlreadyEnabled) {

            if (isTalkbackAlreadyEnabled) {

                logStemTriplePressAccessibilityTelemetry(componentName);

            }

        }