Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"
diff --git a/core/java/android/accessibilityservice/AccessibilityButtonController.java b/core/java/android/accessibilityservice/AccessibilityButtonController.java
index af5af9c..2ccad1d 100644
--- a/core/java/android/accessibilityservice/AccessibilityButtonController.java
+++ b/core/java/android/accessibilityservice/AccessibilityButtonController.java
@@ -23,7 +23,7 @@
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 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 void unregisterAccessibilityButtonCallback(
@NonNull AccessibilityButtonCallback callback) {
- Preconditions.checkNotNull(callback);
+ Objects.requireNonNull(callback);
synchronized (mLock) {
if (mCallbacks == null) {
return;