Merge "Add null check for AccessibilityButtonController.isAccessibilityButtonAvailable" (00db4956) · Commits · e / os / android_frameworks_base

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