summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android/server/ConnectivityServiceTest.java
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2020-03-27 17:57:34 +0900
committerChalard Jean <jchalard@google.com>2020-03-27 23:46:30 +0900
commit2da4f9f9ae75f67788457c99a63de4fd83c3dfd7 (patch)
tree6fe5702367631e17bbe01c14100e58c9fa919829 /tests/net/java/com/android/server/ConnectivityServiceTest.java
parentb0e1e7ec3e15336397d09334fa6a8d44e4fcd12b (diff)
Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests Bug: 152238712 Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
-rw-r--r--tests/net/java/com/android/server/ConnectivityServiceTest.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 4bfb51bca20e..83f4c9817de3 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -2896,7 +2896,7 @@ public class ConnectivityServiceTest {
class ConfidentialMatchAllNetworkSpecifier extends NetworkSpecifier implements
Parcelable {
@Override
- public boolean satisfiedBy(NetworkSpecifier other) {
+ public boolean canBeSatisfiedBy(NetworkSpecifier other) {
return true;
}
@@ -2924,7 +2924,7 @@ public class ConnectivityServiceTest {
}
@Override
- public boolean satisfiedBy(NetworkSpecifier other) {
+ public boolean canBeSatisfiedBy(NetworkSpecifier other) {
if (other instanceof LocalStringNetworkSpecifier) {
return TextUtils.equals(mString,
((LocalStringNetworkSpecifier) other).mString);
@@ -3045,7 +3045,10 @@ public class ConnectivityServiceTest {
});
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 {
@Override public int describeContents() { return 0; }