From f783a5e0595af7de96428ed371c3c6486aaab6c1 Mon Sep 17 00:00:00 2001
From: Daulet Zhanguzin <dauletz@google.com>
Date: Mon, 30 Dec 2019 13:08:09 +0000
Subject: [PATCH] Replace com.android.internal.util.Preconditions.checkNotNull
 with java.util.Objects.requireNonNull

Bug: 126528330

Test: Treehugger
Change-Id: Ie079008722ed1d3423eef5d5391b273754b4ad10
---
 .../AccessibilityButtonController.java                    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/java/android/accessibilityservice/AccessibilityButtonController.java b/core/java/android/accessibilityservice/AccessibilityButtonController.java
index af5af9cb9b172..2ccad1d2d2247 100644
--- a/core/java/android/accessibilityservice/AccessibilityButtonController.java
+++ b/core/java/android/accessibilityservice/AccessibilityButtonController.java
@@ -23,7 +23,7 @@ import android.os.RemoteException;
 import android.util.ArrayMap;
 import android.util.Slog;
 
-import com.android.internal.util.Preconditions;
+import java.util.Objects;
 
 /**
  * Controller for the accessibility button within the system's navigation area
@@ -108,8 +108,8 @@ public final class AccessibilityButtonController {
      */
     public void registerAccessibilityButtonCallback(@NonNull AccessibilityButtonCallback callback,
             @NonNull Handler handler) {
-        Preconditions.checkNotNull(callback);
-        Preconditions.checkNotNull(handler);
+        Objects.requireNonNull(callback);
+        Objects.requireNonNull(handler);
         synchronized (mLock) {
             if (mCallbacks == null) {
                 mCallbacks = new ArrayMap<>();
@@ -127,7 +127,7 @@ public final class AccessibilityButtonController {
      */
     public void unregisterAccessibilityButtonCallback(
             @NonNull AccessibilityButtonCallback callback) {
-        Preconditions.checkNotNull(callback);
+        Objects.requireNonNull(callback);
         synchronized (mLock) {
             if (mCallbacks == null) {
                 return;