| commit | bb8f815f25eddde8ea7b9fec187b6eaa6c99583e | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Dec 14 13:06:14 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 14 13:06:14 2021 +0000 |
| tree | f5de8f4ce5d88059f89d1b80ecdd7a22cdcc0364 | |
| parent | 4c06947fcea2dc9eac8ad2840675abed6b9f07ab [diff] | |
| parent | ef019ffd9bb0e880148a14921567fdb1c8540785 [diff] |
Merge "Mark arg to NC#appliesToUidRange non-null" am: ec3013ddf4 am: 750e482077 am: ef019ffd9b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919249 Change-Id: Ifd4edfac07f77cb9e19e709987174b188f648259
diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java index 621386c..ca5dc34 100644 --- a/framework/src/android/net/NetworkCapabilities.java +++ b/framework/src/android/net/NetworkCapabilities.java
@@ -1669,7 +1669,7 @@ * @hide */ @VisibleForTesting - public boolean appliesToUidRange(@Nullable UidRange requiredRange) { + public boolean appliesToUidRange(@NonNull UidRange requiredRange) { if (null == mUids) return true; for (UidRange uidRange : mUids) { if (uidRange.containsRange(requiredRange)) {