| commit | c0fc62791747a22b40ac45ec15b741ca4bd9169f | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 26 12:05:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 26 12:05:32 2022 +0000 |
| tree | 1214720d6043e3d0bea99fd0fccb338bb4621045 | |
| parent | a088975530baa2bf55d41f67f56aa875213e729e [diff] | |
| parent | 946b17a690421bca213afe665b1ec3976ea7d124 [diff] |
Merge "[MS74] Expose NetworkTemplate#matches" am: 4f6a232bb4 am: 946b17a690 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186 Change-Id: Icb67ee3f11a2077f688f8ea6f990f2f50c94e2c5
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;