Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MS74] Expose NetworkTemplate#matches" am: 05e7864df4 am: 1adb855b0e am: 99b69aa9f9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960186

Change-Id: Idc8add9dc5d9a694cf6c4e1d05ff44a3fbcc7f18
This commit is contained in:
Treehugger Robot
2022-01-26 12:21:40 +00:00
committed by Automerger Merge Worker
parent bc41ceb565 99b69aa9f9
commit 5d486dfa3f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/module-lib-current.txt
View File

@@ -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

4
packages/ConnectivityT/framework-t/src/android/net/NetworkTemplate.java
View File

@@ -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;