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

Commit dde9b103 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ms52-movenetstats" am: a45c0d91 

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

Change-Id: I20304b5f7dcf214ff4cc7da0cb142d2b3fd57211
parents 134b86e9 a45c0d91

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

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ public final class NetworkTemplate implements Parcelable { 
            MATCH_WIFI,

            MATCH_ETHERNET,

            MATCH_BLUETOOTH,

            MATCH_CARRIER

            MATCH_PROXY,

            MATCH_CARRIER,

    })

    public @interface TemplateMatchRule{}
@@ -104,9 +105,8 @@ public final class NetworkTemplate implements Parcelable { 
    /** Match rule to match bluetooth networks. */

    public static final int MATCH_BLUETOOTH = 8;

    /**

     * Match rule to match networks with {@link Connectivity#TYPE_PROXY} as the legacy network type.

     *

     * @hide

     * Match rule to match networks with {@link ConnectivityManager#TYPE_PROXY} as the legacy

     * network type.

     */

    public static final int MATCH_PROXY = 9;

    /**