Remove last NetworkStack usage of hidden APIs
Includes various small changes to stop using hidden APIs Test: make NetworkStack Test: flashed, booted, WiFi and tethering working Bug: 112869080 Change-Id: Id2830795a444f484b377ed6437435a1cd833697a
This commit is contained in:
parent
c7fe99fdbe
commit
6e82be4e4a
1 changed files with 15 additions and 37 deletions
|
|
@ -19,6 +19,7 @@ package android.net;
|
|||
import android.annotation.SystemApi;
|
||||
import android.annotation.TestApi;
|
||||
import android.annotation.UnsupportedAppUsage;
|
||||
import android.net.shared.InetAddressUtils;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
|
||||
|
|
@ -232,10 +233,10 @@ public final class StaticIpConfiguration implements Parcelable {
|
|||
@Override
|
||||
public void writeToParcel(Parcel dest, int flags) {
|
||||
dest.writeParcelable(ipAddress, flags);
|
||||
NetworkUtils.parcelInetAddress(dest, gateway, flags);
|
||||
InetAddressUtils.parcelInetAddress(dest, gateway, flags);
|
||||
dest.writeInt(dnsServers.size());
|
||||
for (InetAddress dnsServer : dnsServers) {
|
||||
NetworkUtils.parcelInetAddress(dest, dnsServer, flags);
|
||||
InetAddressUtils.parcelInetAddress(dest, dnsServer, flags);
|
||||
}
|
||||
dest.writeString(domains);
|
||||
}
|
||||
|
|
@ -244,11 +245,11 @@ public final class StaticIpConfiguration implements Parcelable {
|
|||
public static StaticIpConfiguration readFromParcel(Parcel in) {
|
||||
final StaticIpConfiguration s = new StaticIpConfiguration();
|
||||
s.ipAddress = in.readParcelable(null);
|
||||
s.gateway = NetworkUtils.unparcelInetAddress(in);
|
||||
s.gateway = InetAddressUtils.unparcelInetAddress(in);
|
||||
s.dnsServers.clear();
|
||||
int size = in.readInt();
|
||||
for (int i = 0; i < size; i++) {
|
||||
s.dnsServers.add(NetworkUtils.unparcelInetAddress(in));
|
||||
s.dnsServers.add(InetAddressUtils.unparcelInetAddress(in));
|
||||
}
|
||||
s.domains = in.readString();
|
||||
return s;
|
||||
|
|
|
|||
Loading…
Reference in a new issue