[MS74] Expose NetworkTemplate#matches
This is used by NetworkPolicyManagerService to find relevant networks of a given NetworkPolicy. Test: TH Bug: 204830222 Change-Id: I7176ab727bf208e0fd05ecb9c2bcb00cd3438031
This commit is contained in:
@@ -345,6 +345,7 @@ package android.net {
|
||||
method public int getRoaming();
|
||||
method @NonNull public java.util.Set<java.lang.String> getSubscriberIds();
|
||||
method @NonNull public java.util.Set<java.lang.String> getWifiNetworkKeys();
|
||||
method public boolean matches(@NonNull android.net.NetworkIdentity);
|
||||
method public void writeToParcel(@NonNull android.os.Parcel, int);
|
||||
field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkTemplate> CREATOR;
|
||||
field public static final int MATCH_BLUETOOTH = 8; // 0x8
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user