LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Replace Preconditions.checkNotNull with Objects.requireNonNull"

Browse Source
This commit is contained in:
Treehugger Robot
2021-12-22 11:37:42 +00:00
committed by Gerrit Code Review
parent 1a87666268 49eef6f7e1
commit dae874959a
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
framework-t/src/android/net/IpSecManager.java
View File

@@ -17,8 +17,6 @@ package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES; import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.RequiresFeature; import android.annotation.RequiresFeature;
import android.annotation.RequiresPermission; import android.annotation.RequiresPermission;
@@ -46,6 +44,7 @@ import java.io.IOException;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.util.Objects;
/** /**
* This class contains methods for managing IPsec sessions. Once configured, the kernel will apply * This class contains methods for managing IPsec sessions. Once configured, the kernel will apply
@@ -989,7 +988,7 @@ public final class IpSecManager {
*/ */
public IpSecManager(Context ctx, IIpSecService service) { public IpSecManager(Context ctx, IIpSecService service) {
mContext = ctx; mContext = ctx;
mService = checkNotNull(service, "missing service"); mService = Objects.requireNonNull(service, "missing service");
} }
private static void maybeHandleServiceSpecificException(ServiceSpecificException sse) { private static void maybeHandleServiceSpecificException(ServiceSpecificException sse) {

20
framework-t/src/android/net/IpSecTransform.java
View File

@@ -33,7 +33,6 @@ import android.os.ServiceSpecificException;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions;
import dalvik.system.CloseGuard; import dalvik.system.CloseGuard;
@@ -41,6 +40,7 @@ import java.io.IOException;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.Objects;
/** /**
* This class represents a transform, which roughly corresponds to an IPsec Security Association. * This class represents a transform, which roughly corresponds to an IPsec Security Association.
@@ -255,7 +255,7 @@ public final class IpSecTransform implements AutoCloseable {
@NonNull @NonNull
public IpSecTransform.Builder setEncryption(@NonNull IpSecAlgorithm algo) { public IpSecTransform.Builder setEncryption(@NonNull IpSecAlgorithm algo) {
// TODO: throw IllegalArgumentException if algo is not an encryption algorithm. // TODO: throw IllegalArgumentException if algo is not an encryption algorithm.
Preconditions.checkNotNull(algo); Objects.requireNonNull(algo);
mConfig.setEncryption(algo); mConfig.setEncryption(algo);
return this; return this;
} }
@@ -270,7 +270,7 @@ public final class IpSecTransform implements AutoCloseable {
@NonNull @NonNull
public IpSecTransform.Builder setAuthentication(@NonNull IpSecAlgorithm algo) { public IpSecTransform.Builder setAuthentication(@NonNull IpSecAlgorithm algo) {
// TODO: throw IllegalArgumentException if algo is not an authentication algorithm. // TODO: throw IllegalArgumentException if algo is not an authentication algorithm.
Preconditions.checkNotNull(algo); Objects.requireNonNull(algo);
mConfig.setAuthentication(algo); mConfig.setAuthentication(algo);
return this; return this;
} }
@@ -290,7 +290,7 @@ public final class IpSecTransform implements AutoCloseable {
*/ */
@NonNull @NonNull
public IpSecTransform.Builder setAuthenticatedEncryption(@NonNull IpSecAlgorithm algo) { public IpSecTransform.Builder setAuthenticatedEncryption(@NonNull IpSecAlgorithm algo) {
Preconditions.checkNotNull(algo); Objects.requireNonNull(algo);
mConfig.setAuthenticatedEncryption(algo); mConfig.setAuthenticatedEncryption(algo);
return this; return this;
} }
@@ -311,7 +311,7 @@ public final class IpSecTransform implements AutoCloseable {
@NonNull @NonNull
public IpSecTransform.Builder setIpv4Encapsulation( public IpSecTransform.Builder setIpv4Encapsulation(
@NonNull IpSecManager.UdpEncapsulationSocket localSocket, int remotePort) { @NonNull IpSecManager.UdpEncapsulationSocket localSocket, int remotePort) {
Preconditions.checkNotNull(localSocket); Objects.requireNonNull(localSocket);
mConfig.setEncapType(ENCAP_ESPINUDP); mConfig.setEncapType(ENCAP_ESPINUDP);
if (localSocket.getResourceId() == INVALID_RESOURCE_ID) { if (localSocket.getResourceId() == INVALID_RESOURCE_ID) {
throw new IllegalArgumentException("Invalid UdpEncapsulationSocket"); throw new IllegalArgumentException("Invalid UdpEncapsulationSocket");
@@ -348,8 +348,8 @@ public final class IpSecTransform implements AutoCloseable {
@NonNull IpSecManager.SecurityParameterIndex spi) @NonNull IpSecManager.SecurityParameterIndex spi)
throws IpSecManager.ResourceUnavailableException, throws IpSecManager.ResourceUnavailableException,
IpSecManager.SpiUnavailableException, IOException { IpSecManager.SpiUnavailableException, IOException {
Preconditions.checkNotNull(sourceAddress); Objects.requireNonNull(sourceAddress);
Preconditions.checkNotNull(spi); Objects.requireNonNull(spi);
if (spi.getResourceId() == INVALID_RESOURCE_ID) { if (spi.getResourceId() == INVALID_RESOURCE_ID) {
throw new IllegalArgumentException("Invalid SecurityParameterIndex"); throw new IllegalArgumentException("Invalid SecurityParameterIndex");
} }
@@ -387,8 +387,8 @@ public final class IpSecTransform implements AutoCloseable {
@NonNull IpSecManager.SecurityParameterIndex spi) @NonNull IpSecManager.SecurityParameterIndex spi)
throws IpSecManager.ResourceUnavailableException, throws IpSecManager.ResourceUnavailableException,
IpSecManager.SpiUnavailableException, IOException { IpSecManager.SpiUnavailableException, IOException {
Preconditions.checkNotNull(sourceAddress); Objects.requireNonNull(sourceAddress);
Preconditions.checkNotNull(spi); Objects.requireNonNull(spi);
if (spi.getResourceId() == INVALID_RESOURCE_ID) { if (spi.getResourceId() == INVALID_RESOURCE_ID) {
throw new IllegalArgumentException("Invalid SecurityParameterIndex"); throw new IllegalArgumentException("Invalid SecurityParameterIndex");
} }
@@ -404,7 +404,7 @@ public final class IpSecTransform implements AutoCloseable {
* @param context current context * @param context current context
*/ */
public Builder(@NonNull Context context) { public Builder(@NonNull Context context) {
Preconditions.checkNotNull(context); Objects.requireNonNull(context);
mContext = context; mContext = context;
mConfig = new IpSecConfig(); mConfig = new IpSecConfig();
} }