Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-06 14:17:23 +00:00
committed by Android (Google) Code Review
parent 30b90101c7 90e91ce0a7
commit c79d2b8b43
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/location/RemoteListenerHelper.java
View File

@@ -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<TListener extends IInterface> {
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<TListener extends IInterface> {
* 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<TListener extends IInterface> {
* 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()) {