From 90e91ce0a77ce7b875c47cd0be44d7a69320c829 Mon Sep 17 00:00:00 2001 From: Daulet Zhanguzin Date: Thu, 2 Jan 2020 17:37:10 +0000 Subject: Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull Bug: 126528330 Test: Treehugger Change-Id: If8e54d8479223342a56e93f0659bcb553ac63624 --- .../java/com/android/server/location/RemoteListenerHelper.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/location/RemoteListenerHelper.java b/services/core/java/com/android/server/location/RemoteListenerHelper.java index 60ce1f4d56f7..015227394ffe 100644 --- a/services/core/java/com/android/server/location/RemoteListenerHelper.java +++ b/services/core/java/com/android/server/location/RemoteListenerHelper.java @@ -25,10 +25,9 @@ import android.os.IInterface; import android.os.RemoteException; import android.util.Log; -import com.android.internal.util.Preconditions; - import java.util.HashMap; import java.util.Map; +import java.util.Objects; /** * A helper class that handles operations in remote listeners. @@ -61,7 +60,7 @@ public abstract class RemoteListenerHelper { private int mLastReportedResult = RESULT_UNKNOWN; protected RemoteListenerHelper(Context context, Handler handler, String name) { - Preconditions.checkNotNull(name); + Objects.requireNonNull(name); mHandler = handler; mTag = name; mContext = context; @@ -77,7 +76,7 @@ public abstract class RemoteListenerHelper { * Adds GNSS data listener {@code listener} with caller identify {@code callerIdentify}. */ public void addListener(@NonNull TListener listener, CallerIdentity callerIdentity) { - Preconditions.checkNotNull(listener, "Attempted to register a 'null' listener."); + Objects.requireNonNull(listener, "Attempted to register a 'null' listener."); IBinder binder = listener.asBinder(); synchronized (mListenerMap) { if (mListenerMap.containsKey(binder)) { @@ -116,7 +115,7 @@ public abstract class RemoteListenerHelper { * Remove GNSS data listener {@code listener}. */ public void removeListener(@NonNull TListener listener) { - Preconditions.checkNotNull(listener, "Attempted to remove a 'null' listener."); + Objects.requireNonNull(listener, "Attempted to remove a 'null' listener."); synchronized (mListenerMap) { mListenerMap.remove(listener.asBinder()); if (mListenerMap.isEmpty()) { -- cgit v1.2.3-59-g8ed1b