From 7ab28d5126091a0a009982bbcd2a60a2611bd8a3 Mon Sep 17 00:00:00 2001
From: mincheli <mincheli@google.com>
Date: Wed, 20 Mar 2019 12:23:05 +0800
Subject: 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
---
 .../AccessibilityButtonController.java                   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/core/java/android/accessibilityservice/AccessibilityButtonController.java b/core/java/android/accessibilityservice/AccessibilityButtonController.java
index a70085cbde4f..af5af9cb9b17 100644
--- a/core/java/android/accessibilityservice/AccessibilityButtonController.java
+++ b/core/java/android/accessibilityservice/AccessibilityButtonController.java
@@ -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,13 +75,16 @@ public final class AccessibilityButtonController {
      * available to the calling service, {@code false} otherwise
      */
     public boolean isAccessibilityButtonAvailable() {
-        try {
-            return mServiceConnection.isAccessibilityButtonAvailable();
-        } catch (RemoteException re) {
-            Slog.w(LOG_TAG, "Failed to get accessibility button availability.", re);
-            re.rethrowFromSystemServer();
-            return false;
+        if (mServiceConnection != null) {
+            try {
+                return mServiceConnection.isAccessibilityButtonAvailable();
+            } catch (RemoteException re) {
+                Slog.w(LOG_TAG, "Failed to get accessibility button availability.", re);
+                re.rethrowFromSystemServer();
+                return false;
+            }
         }
+        return false;
     }
 
     /**
-- 
cgit v1.2.3-59-g8ed1b