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

Fix some @hide usage in Tethering

Browse Source 
Using alternative way to replace some @hide API.

Bug: 144814072
Test: build, flash, boot
      atest TetheringTests

Change-Id: I1e12d69db1ad91dff553e142e17c6a70808e1639
This commit is contained in:
markchien
2019-12-06 15:24:53 +08:00
parent b2bb37098f
commit 6cf0e550c7
19 changed files with 219 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Tethering/src/android/net/dhcp/DhcpServingParamsParcelExt.java
View File

@@ -20,11 +20,11 @@ import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH;
import android.annotation.NonNull;
import android.net.LinkAddress;
import com.google.android.collect.Sets;
import android.util.ArraySet;
import java.net.Inet4Address;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
/**
@@ -68,7 +68,7 @@ public class DhcpServingParamsParcelExt extends DhcpServingParamsParcel {
* but it must always be set explicitly.
*/
public DhcpServingParamsParcelExt setDefaultRouters(@NonNull Inet4Address... defaultRouters) {
return setDefaultRouters(Sets.newArraySet(defaultRouters));
return setDefaultRouters(newArraySet(defaultRouters));
}
/**
@@ -96,7 +96,7 @@ public class DhcpServingParamsParcelExt extends DhcpServingParamsParcel {
* <p>This may be an empty list of servers, but it must always be set explicitly.
*/
public DhcpServingParamsParcelExt setDnsServers(@NonNull Inet4Address... dnsServers) {
return setDnsServers(Sets.newArraySet(dnsServers));
return setDnsServers(newArraySet(dnsServers));
}
/**
@@ -126,7 +126,7 @@ public class DhcpServingParamsParcelExt extends DhcpServingParamsParcel {
* and do not need to be set here.
*/
public DhcpServingParamsParcelExt setExcludedAddrs(@NonNull Inet4Address... excludedAddrs) {
return setExcludedAddrs(Sets.newArraySet(excludedAddrs));
return setExcludedAddrs(newArraySet(excludedAddrs));
}
/**
@@ -169,4 +169,10 @@ public class DhcpServingParamsParcelExt extends DhcpServingParamsParcel {
}
return res;
}
private static ArraySet<Inet4Address> newArraySet(Inet4Address... addrs) {
ArraySet<Inet4Address> addrSet = new ArraySet<>(addrs.length);
Collections.addAll(addrSet, addrs);
return addrSet;
}
}