Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d486dfa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[MS74] Expose NetworkTemplate#matches" am: 05e7864d am: 1adb855b am: 99b69aa9 

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

Change-Id: Idc8add9dc5d9a694cf6c4e1d05ff44a3fbcc7f18
parents bc41ceb5 99b69aa9

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

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

+3 −1
Original line number Diff line number Diff line
@@ -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;