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

Commit 7ab28d51 authored by mincheli's avatar mincheli
Browse files

Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable 

Just add a null check to reduce NullPointerException happening.

Bug: 110361782
Test: Test: a11y CTS & unit test
Change-Id: Ia4e39c5b3af4943fba2f9ad545b96d5983ee780d
parent d4b81682

core/java/android/accessibilityservice/AccessibilityButtonController.java

+9 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.accessibilityservice;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.os.Handler;

import android.os.Looper;

import android.os.RemoteException;
@@ -76,6 +75,7 @@ public final class AccessibilityButtonController { 
     * available to the calling service, {@code false} otherwise

     */

    public boolean isAccessibilityButtonAvailable() {

        if (mServiceConnection != null) {

            try {

                return mServiceConnection.isAccessibilityButtonAvailable();

            } catch (RemoteException re) {
@@ -84,6 +84,8 @@ public final class AccessibilityButtonController { 
                return false;

            }

        }

        return false;

    }



    /**

     * Registers the provided {@link AccessibilityButtonCallback} for interaction and state