| commit | d596b1615622a13480e69b7b65e47487dbf25d9b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 12:21:40 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 12:21:40 2022 +0000 |
| tree | 1214720d6043e3d0bea99fd0fccb338bb4621045 | |
| parent | 3aed030c7e91987765e79bca6c6314836008f57a [diff] | |
| parent | c0fc62791747a22b40ac45ec15b741ca4bd9169f [diff] |
Merge "[MS74] Expose NetworkTemplate#matches" am: 4f6a232bb4 am: 946b17a690 am: c0fc627917 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186 Change-Id: Idc8add9dc5d9a694cf6c4e1d05ff44a3fbcc7f18
diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java index cad8075..dba3991 100644 --- a/framework-t/src/android/net/NetworkTemplate.java +++ b/framework-t/src/android/net/NetworkTemplate.java
@@ -652,7 +652,9 @@ * * @hide */ - public boolean matches(NetworkIdentity ident) { + @SystemApi(client = MODULE_LIBRARIES) + public boolean matches(@NonNull NetworkIdentity ident) { + Objects.requireNonNull(ident); if (!matchesMetered(ident)) return false; if (!matchesRoaming(ident)) return false; if (!matchesDefaultNetwork(ident)) return false;