commit d15fcc3048e955d7f8a6e4f8d0ee8738c16fb1aa
author Lucas Lin <lucaslin@google.com> Thu Jan 28 04:01:49 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 28 04:01:49 2021 +0000
tree 6d52a96ac41b976053f54f2ea4481c7ece7d273d
parent c1140f2a33d8d506cfd894e1e6ee143aaa7c2313
parent 61ad5f342e3bc69f2ae8bff9e55751974a7d1bed

Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier"

core/java/android/net/NetworkRequest.java

diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java
index f0c637c..04011fc 100644
--- a/core/java/android/net/NetworkRequest.java
+++ b/core/java/android/net/NetworkRequest.java
@@ -353,7 +353,9 @@
          *                         NetworkSpecifier.
          */
         public Builder setNetworkSpecifier(NetworkSpecifier networkSpecifier) {
-            MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(networkSpecifier);
+            if (networkSpecifier instanceof MatchAllNetworkSpecifier) {
+                throw new IllegalArgumentException("A MatchAllNetworkSpecifier is not permitted");
+            }
             mNetworkCapabilities.setNetworkSpecifier(networkSpecifier);
             return this;
         }

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 74a6e07..410ec1d 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -5658,7 +5658,9 @@
         if (ns == null) {
             return;
         }
-        MatchAllNetworkSpecifier.checkNotMatchAllNetworkSpecifier(ns);
+        if (ns instanceof MatchAllNetworkSpecifier) {
+            throw new IllegalArgumentException("A MatchAllNetworkSpecifier is not permitted");
+        }
     }
 
     private void ensureValid(NetworkCapabilities nc) {