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

StaticIpConfiguration: Couple of minor fixes

Browse Source 
a) Ensure the Builder.build() does not crash if setDnsServers() is not
invoked.
b) Add a checkNotNull on setDnsServers() since it is marked @NonNull.

Bug: 144487020
Test: Compiles
Change-Id: I2b9f990efa0583c0f067c25e23d8c944ffbdf6a5
(cherry-picked from d0348339c50eeae0fe137c62476f6a01542f4163)
This commit is contained in:
Roshan Pius
2019-11-14 12:20:41 -08:00
parent 96639a6e4e
commit 32b898bb6d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/StaticIpConfiguration.java
View File

@@ -25,6 +25,8 @@ import android.net.shared.InetAddressUtils;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.android.internal.util.Preconditions;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -152,6 +154,7 @@ public final class StaticIpConfiguration implements Parcelable {
* @return The {@link Builder} for chaining. * @return The {@link Builder} for chaining.
*/ */
public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) { public @NonNull Builder setDnsServers(@NonNull Iterable<InetAddress> dnsServers) {
Preconditions.checkNotNull(dnsServers);
mDnsServers = dnsServers; mDnsServers = dnsServers;
return this; return this;
} }
@@ -175,9 +178,11 @@ public final class StaticIpConfiguration implements Parcelable {
final StaticIpConfiguration config = new StaticIpConfiguration(); final StaticIpConfiguration config = new StaticIpConfiguration();
config.ipAddress = mIpAddress; config.ipAddress = mIpAddress;
config.gateway = mGateway; config.gateway = mGateway;
if (mDnsServers != null) {
for (InetAddress server : mDnsServers) { for (InetAddress server : mDnsServers) {
config.dnsServers.add(server); config.dnsServers.add(server);
} }
}
config.domains = mDomains; config.domains = mDomains;
return config; return config;
} }