commit 4f6a232bb450966c442f331efbf4d25998cd01c0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 26 11:33:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 26 11:33:29 2022 +0000
tree 1214720d6043e3d0bea99fd0fccb338bb4621045
parent ce3dbdb7418ade46f968fe685deab1f122761e5f
parent ad252f83473990880a6736e254ea5046ce843293

Merge "[MS74] Expose NetworkTemplate#matches"

framework-t/src/android/net/NetworkTemplate.java

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;