From 6a9bb8e84a308152485a8d64b7bf94b548ba5db9 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Wed, 15 Mar 2017 23:05:01 +0900 Subject: Connectivity metrics: serialize networkId, transports, ifname This patch adds translation from ConnectivityMetricsEvent to IpConnectivityEvent of recently added fields: - top-level network id - top-level ifname - transports Also adds inference of link layer from transports or ifname. At the moment these new fields are not populated in ConnectivityMetricsEvent. Follow-up patches will fill this gap for the events of the android.net.metrics package. Test: new unit tests, $ runtest frameworks-net passes Bug: 34901696 Merged-In: I563a6a3183470bdfaabb7c781a1beaf6b1058bf0 (partial cherry pick from commit 73fd4d1fafd0208e843abb6a6ad8a46a6fb18143) Change-Id: I6a00270e73a1bd07f23c367f2394d90a43ced47a Test: runtest frameworks-net (not in original commit message) --- core/java/android/net/NetworkCapabilities.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 1da0d281538d..bf7207ca5bbb 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -418,8 +418,10 @@ public final class NetworkCapabilities implements Parcelable { */ public static final int TRANSPORT_WIFI_AWARE = 5; - private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; - private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; + /** @hide */ + public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; + /** @hide */ + public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; private static final String[] TRANSPORT_NAMES = { "CELLULAR", -- cgit v1.2.3-59-g8ed1b From 5f9157651e80ed3c1ee4d2bc7ee662b0653899c8 Mon Sep 17 00:00:00 2001 From: Robert Quattlebaum Date: Mon, 15 May 2017 15:53:29 -0700 Subject: NetworkCapabilities: Added support for TRANSPORT_LOWPAN This change simply adds a new constant, `TRANSPORT_LOWPAN`, for identifying low-power wireless networks like Thread. Bug: b/33073713 Merged-In: Ie4aa77496f8ff466fa1a5fbc556e9c029457a689 (cherry pick from commit 557e0c38b98f66d6147206f23d24d8d73b09e3e5) Change-Id: I21f9b41b8b31c63ceeb1bc9c965f6da2614c356a Test: runtest frameworks-net (not in original commit message) --- core/java/android/net/NetworkCapabilities.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index bf7207ca5bbb..2dd7f757aea3 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -418,10 +418,16 @@ public final class NetworkCapabilities implements Parcelable { */ public static final int TRANSPORT_WIFI_AWARE = 5; + /** + * Indicates this network uses a LoWPAN transport. + * @hide + */ + public static final int TRANSPORT_LOWPAN = 6; + /** @hide */ public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; /** @hide */ - public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; + public static final int MAX_TRANSPORT = TRANSPORT_LOWPAN; private static final String[] TRANSPORT_NAMES = { "CELLULAR", @@ -429,7 +435,8 @@ public final class NetworkCapabilities implements Parcelable { "BLUETOOTH", "ETHERNET", "VPN", - "WIFI_AWARE" + "WIFI_AWARE", + "LOWPAN" }; /** -- cgit v1.2.3-59-g8ed1b