Merge "Replace Preconditions.checkNotNull with Objects.requireNonNull."
This commit is contained in:
@@ -16,8 +16,6 @@
|
|||||||
|
|
||||||
package com.android.server.ethernet;
|
package com.android.server.ethernet;
|
||||||
|
|
||||||
import static com.android.internal.util.Preconditions.checkNotNull;
|
|
||||||
|
|
||||||
import android.annotation.NonNull;
|
import android.annotation.NonNull;
|
||||||
import android.annotation.Nullable;
|
import android.annotation.Nullable;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
@@ -370,7 +368,7 @@ public class EthernetNetworkFactory extends NetworkFactory {
|
|||||||
@NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory,
|
@NonNull NetworkCapabilities capabilities, NetworkFactory networkFactory,
|
||||||
Dependencies deps) {
|
Dependencies deps) {
|
||||||
name = ifaceName;
|
name = ifaceName;
|
||||||
mCapabilities = checkNotNull(capabilities);
|
mCapabilities = Objects.requireNonNull(capabilities);
|
||||||
mHandler = handler;
|
mHandler = handler;
|
||||||
mContext = context;
|
mContext = context;
|
||||||
mNetworkFactory = networkFactory;
|
mNetworkFactory = networkFactory;
|
||||||
|
|||||||
Reference in New Issue
Block a user