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

Commit 74f9e1b8 authored by Phil Weaver's avatar Phil Weaver Committed by vinodkrishnan
Browse files

Add null check to a11y interrupt. 

Also adding same robustness to interrupt that we have for
sending a11y events.

Bug: 32507871

Test: Ran a11y CTS. Verified manually with sample app
that sends interrupt and accessibility service that
crashes when started. That case used to crash the
app, and doesn't anymore.
Change-Id: I5cf05dcbb54ea23ae876cb3258dd206c55dce775
(cherry picked from commit 867ad35d)
parent 18382374

core/java/android/view/accessibility/AccessibilityManager.java

+12 −1
Original line number Diff line number Diff line
@@ -353,7 +353,18 @@ public final class AccessibilityManager { 
                return;

            }

            if (!mIsEnabled) {

                throw new IllegalStateException("Accessibility off. Did you forget to check that?");

                Looper myLooper = Looper.myLooper();

                if (myLooper == Looper.getMainLooper()) {

                    throw new IllegalStateException(

                            "Accessibility off. Did you forget to check that?");

                } else {

                    // If we're not running on the thread with the main looper, it's possible for

                    // the state of accessibility to change between checking isEnabled and

                    // calling this method. So just log the error rather than throwing the

                    // exception.

                    Log.e(LOG_TAG, "Interrupt called with accessibility disabled");

                    return;

                }

            }

            userId = mUserId;

        }

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

+16 −7
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 


    @Override

    public void interrupt(int userId) {

        CopyOnWriteArrayList<Service> services;

        List<IAccessibilityServiceClient> interfacesToInterrupt;

        synchronized (mLock) {

            // We treat calls from a profile as if made by its parent as profiles

            // share the accessibility state of the parent. The call below
@@ -549,15 +549,24 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { 
            if (resolvedUserId != mCurrentUserId) {

                return;

            }

            services = getUserStateLocked(resolvedUserId).mBoundServices;

        }

        for (int i = 0, count = services.size(); i < count; i++) {

            List<Service> services = getUserStateLocked(resolvedUserId).mBoundServices;

            int numServices = services.size();

            interfacesToInterrupt = new ArrayList<>(numServices);

            for (int i = 0; i < numServices; i++) {

                Service service = services.get(i);

                IBinder a11yServiceBinder = service.mService;

                IAccessibilityServiceClient a11yServiceInterface = service.mServiceInterface;

                if ((a11yServiceBinder != null) && (a11yServiceInterface != null)) {

                    interfacesToInterrupt.add(a11yServiceInterface);

                }

            }

        }

        for (int i = 0, count = interfacesToInterrupt.size(); i < count; i++) {

            try {

                service.mServiceInterface.onInterrupt();

                interfacesToInterrupt.get(i).onInterrupt();

            } catch (RemoteException re) {

                Slog.e(LOG_TAG, "Error during sending interrupt request to "

                    + service.mService, re);

                Slog.e(LOG_TAG, "Error sending interrupt request to "

                        + interfacesToInterrupt.get(i), re);

            }

        }

    }