| commit | d1e7bd6099440ecfd197b815d4050ff2619ba175 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Feb 28 07:05:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 28 07:05:04 2022 +0000 |
| tree | 89fffe8e8efeb6d5f67e2e7ca3de3e68f530db8c | |
| parent | daaabd3fe9b184ed618c33753d115c12460cf604 [diff] | |
| parent | d94a6ca17c6b65040e26d617907b2c0c465ed972 [diff] |
Merge changes from topic "ms52-movenetstats" am: ca25ad3567 am: d94a6ca17c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987470 Change-Id: Iddf4ba9b30accfdda6d41a7e97fe24541567cbfb
diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java index 9b58b01..7b5afd7 100644 --- a/framework-t/src/android/net/NetworkTemplate.java +++ b/framework-t/src/android/net/NetworkTemplate.java
@@ -79,7 +79,8 @@ MATCH_WIFI, MATCH_ETHERNET, MATCH_BLUETOOTH, - MATCH_CARRIER + MATCH_PROXY, + MATCH_CARRIER, }) public @interface TemplateMatchRule{} @@ -104,9 +105,8 @@ /** 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; /**