commit 2da4f9f9ae75f67788457c99a63de4fd83c3dfd7
author Chalard Jean <jchalard@google.com> Fri Mar 27 17:57:34 2020 +0900
committer Chalard Jean <jchalard@google.com> Fri Mar 27 23:46:30 2020 +0900
tree 6fe5702367631e17bbe01c14100e58c9fa919829
parent b0e1e7ec3e15336397d09334fa6a8d44e4fcd12b

Rename satisfiedBy into canBeSatisfiedBy

Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1

core/java/android/net/NetworkCapabilities.java

diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java
index af9414c..91ef911 100644
--- a/core/java/android/net/NetworkCapabilities.java
+++ b/core/java/android/net/NetworkCapabilities.java
@@ -1122,7 +1122,7 @@
     }
 
     private boolean satisfiedBySpecifier(NetworkCapabilities nc) {
-        return mNetworkSpecifier == null || mNetworkSpecifier.satisfiedBy(nc.mNetworkSpecifier)
+        return mNetworkSpecifier == null || mNetworkSpecifier.canBeSatisfiedBy(nc.mNetworkSpecifier)
                 || nc.mNetworkSpecifier instanceof MatchAllNetworkSpecifier;
     }