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

Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202

Browse Source 
Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
This commit is contained in:
Chalard Jean
2020-04-02 06:15:02 +00:00
committed by Automerger Merge Worker
parent 811833721f 9122e56202
commit 0d7aa85f99
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -1177,7 +1177,7 @@ public final class NetworkCapabilities implements Parcelable {
} }
private boolean satisfiedBySpecifier(NetworkCapabilities nc) { private boolean satisfiedBySpecifier(NetworkCapabilities nc) {
return mNetworkSpecifier == null || mNetworkSpecifier.satisfiedBy(nc.mNetworkSpecifier) return mNetworkSpecifier == null || mNetworkSpecifier.canBeSatisfiedBy(nc.mNetworkSpecifier)
|| nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier; || nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier;
} }

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

@@ -474,7 +474,7 @@ public class NetworkRequest implements Parcelable {
* @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not * @param nc Capabilities that should satisfy this NetworkRequest. null capabilities do not
* satisfy any request. * satisfy any request.
*/ */
public boolean satisfiedBy(@Nullable NetworkCapabilities nc) { public boolean canBeSatisfiedBy(@Nullable NetworkCapabilities nc) {
return networkCapabilities.satisfiedByNetworkCapabilities(nc); return networkCapabilities.satisfiedByNetworkCapabilities(nc);
} }

9
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -2913,7 +2913,7 @@ public class ConnectivityServiceTest {
class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements
Parcelable { Parcelable {
@Override @Override
public boolean satisfiedBy(NetworkSpecifier other) { public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return true; return true;
} }
@@ -2941,7 +2941,7 @@ public class ConnectivityServiceTest {
} }
@Override @Override
public boolean satisfiedBy(NetworkSpecifier other) { public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (other instanceof LocalStringNetworkSpecifier) { if (other instanceof LocalStringNetworkSpecifier) {
return TextUtils.equals(mString, return TextUtils.equals(mString,
((LocalStringNetworkSpecifier) other).mString); ((LocalStringNetworkSpecifier) other).mString);
@@ -3062,7 +3062,10 @@ public class ConnectivityServiceTest {
}); });
class NonParcelableSpecifier extends NetworkSpecifier { class NonParcelableSpecifier extends NetworkSpecifier {
public boolean satisfiedBy(NetworkSpecifier other) { return false; } @Override
public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return false;
}
}; };
class ParcelableSpecifier extends NonParcelableSpecifier implements Parcelable { class ParcelableSpecifier extends NonParcelableSpecifier implements Parcelable {
@Override public int describeContents() { return 0; } @Override public int describeContents() { return 0; }