diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2022-02-28 05:32:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-28 05:32:23 +0000 |
| commit | ca25ad35677566218c50d28feb5891d9f39a06d0 (patch) | |
| tree | 89fffe8e8efeb6d5f67e2e7ca3de3e68f530db8c /framework-t/src/android/net/NetworkTemplate.java | |
| parent | 213018b736f5f3753f1fdd92cdb6704611595c99 (diff) | |
| parent | fe5ed721bea0543525742b66f4d29f0d2d01d7f5 (diff) | |
Merge changes from topic "ms52-movenetstats"
* changes:
Expose MATCH_PROXY as a module-lib API.
Add setPollForce to module API
Move networkstats JNI to connectivity module
[MS54.1] Move NetworkStats to updatable sources
[MS62.1] Start NetworkStatsService from the module
Diffstat (limited to 'framework-t/src/android/net/NetworkTemplate.java')
| -rw-r--r-- | framework-t/src/android/net/NetworkTemplate.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework-t/src/android/net/NetworkTemplate.java b/framework-t/src/android/net/NetworkTemplate.java index 9b58b016bb..7b5afd7200 100644 --- a/framework-t/src/android/net/NetworkTemplate.java +++ b/framework-t/src/android/net/NetworkTemplate.java @@ -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; /** |