diff options
| author | 2022-01-26 12:21:40 +0000 | |
|---|---|---|
| committer | 2022-01-26 12:21:40 +0000 | |
| commit | 5d486dfa3f91bfb9a03397e71a2ecf4465047eb4 (patch) | |
| tree | 9bb70c099b649f7523781bd8e9b12ae401d673ec | |
| parent | bc41ceb565896718674a587805535e7033c14c7c (diff) | |
| parent | 99b69aa9f9dfabbb958a72b4633e63b184fc6bcb (diff) | |
Merge "[MS74] Expose NetworkTemplate#matches" am: 05e7864df4 am: 1adb855b0e am: 99b69aa9f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186
Change-Id: Idc8add9dc5d9a694cf6c4e1d05ff44a3fbcc7f18
| -rw-r--r-- | core/api/module-lib-current.txt | 1 | ||||
| -rw-r--r-- | packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 8fd3e6ec4446..74ec189514c5 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -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 diff --git a/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java b/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java index cad80752b8e7..dba39913300c 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java +++ b/packages/ConnectivityT/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; |