diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-01-28 05:32:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 05:32:36 +0000 |
| commit | 65fd64d49414de270524d2f4811b00318a77f7cc (patch) | |
| tree | 9edfeac6b458c300ced7413533ef7c3dc24b5a9f /core/java/android | |
| parent | e9fb208974c1f83249ebb1b81f79b6e174df03a2 (diff) | |
| parent | dbc70f90c79213d286fd251897275db36e0a5832 (diff) | |
Merge "Check if NetworkSpecifier is an instance of MatchAllNetworkSpecifier" am: ec3f650de7 am: b82753716e am: dbc70f90c7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1f7bafc63926c7c68c7c3cdd13069234487888fa
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkRequest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkRequest.java b/core/java/android/net/NetworkRequest.java index 66b99b9ba319..c4d1b09a5c20 100644 --- a/core/java/android/net/NetworkRequest.java +++ b/core/java/android/net/NetworkRequest.java @@ -353,7 +353,9 @@ public class NetworkRequest implements Parcelable { * 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; } |