LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[MS74] Expose NetworkTemplate#matches" am: 4f6a232bb4 am: 946b17a690 am: c0fc627917 am: d596b16156

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

Change-Id: Id1d9b54c7e359f893c3f155760a4b750a704e224
This commit is contained in:
Treehugger Robot
2022-01-26 12:40:36 +00:00
committed by Automerger Merge Worker
parent 9f9c02a359 d596b16156
commit 09b7c0ae16
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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