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

Merge changes from topic "ms52-movenetstats" am: a45c0d91fa am: dde9b1031c

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

Change-Id: Iddf4ba9b30accfdda6d41a7e97fe24541567cbfb
This commit is contained in:
Lorenzo Colitti
2022-02-28 07:05:04 +00:00
committed by Automerger Merge Worker
parent 3d3257e10e dde9b1031c
commit 8b0fe4e89a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,8 @@ public final class NetworkTemplate implements Parcelable {
MATCH_WIFI, MATCH_WIFI,
MATCH_ETHERNET, MATCH_ETHERNET,
MATCH_BLUETOOTH, MATCH_BLUETOOTH,
MATCH_CARRIER MATCH_PROXY,
MATCH_CARRIER,
}) })
public @interface TemplateMatchRule{} public @interface TemplateMatchRule{}
@@ -104,9 +105,8 @@ public final class NetworkTemplate implements Parcelable {
/** Match rule to match bluetooth networks. */ /** Match rule to match bluetooth networks. */
public static final int MATCH_BLUETOOTH = 8; public static final int MATCH_BLUETOOTH = 8;
/** /**
* Match rule to match networks with {@link Connectivity#TYPE_PROXY} as the legacy network type. * Match rule to match networks with {@link ConnectivityManager#TYPE_PROXY} as the legacy
* * network type.
* @hide
*/ */
public static final int MATCH_PROXY = 9; public static final int MATCH_PROXY = 9;
/** /**