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

Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier

Browse Source 
To prevent mainline module related file to access a hidden API,
check whether the NetworkSpecifier is an instance of
MatchAllNetworkSpecifier by itself.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I4d49cb70ff3c8a7e1ffa32e38207c74a6375e51a
This commit is contained in:
lucaslin
2021-01-22 15:15:23 +08:00
parent b746bc77c2
commit 22f9b9f64b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/NetworkRequest.java
View File

@@ -353,7 +353,9 @@ public class NetworkRequest implements Parcelable {
* NetworkSpecifier. * NetworkSpecifier.
*/ */
public Builder setNetworkSpecifier(NetworkSpecifier networkSpecifier) { public Builder setNetworkSpecifier(NetworkSpecifier networkSpecifier) {
MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(networkSpecifier); if (networkSpecifier instanceof MatchAllNetworkSpecifier) {
throw new IllegalArgumentException("A MatchAllNetworkSpecifier is not permitted");
}
mNetworkCapabilities.setNetworkSpecifier(networkSpecifier); mNetworkCapabilities.setNetworkSpecifier(networkSpecifier);
return this; return this;
} }

4
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -5580,7 +5580,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (ns == null) { if (ns == null) {
return; return;
} }
MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(ns); if (ns instanceof MatchAllNetworkSpecifier) {
throw new IllegalArgumentException("A MatchAllNetworkSpecifier is not permitted");
}
} }
private void ensureValid(NetworkCapabilities nc) { private void ensureValid(NetworkCapabilities nc) {