From a47e4001acbb594e29b392392c7d0fdf77df75e6 Mon Sep 17 00:00:00 2001 From: junyulai Date: Wed, 26 Jan 2022 01:11:08 +0800 Subject: [PATCH] [MS74] Expose NetworkTemplate#matches This is used by NetworkPolicyManagerService to find relevant networks of a given NetworkPolicy. Test: TH Bug: 204830222 Change-Id: I7176ab727bf208e0fd05ecb9c2bcb00cd3438031 --- framework-t/src/android/net/NetworkTemplate.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java index cad80752b8..dba3991330 100644 --- a/framework-t/src/android/net/NetworkTemplate.java +++ b/framework-t/src/android/net/NetworkTemplate.java @@ -652,7 +652,9 @@ public final class NetworkTemplate implements Parcelable { * * @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;