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 45f6ef836d)

Change-Id: I6a00270e73a1bd07f23c367f2394d90a43ced47a

Test: runtest frameworks-net (not in original commit message)
This commit is contained in:
Hugo Benichi
2017-03-15 23:05:01 +09:00
parent 7ab07a36c9
commit cbe178fa80

View File

@@ -418,8 +418,10 @@ public final class NetworkCapabilities implements Parcelable {
*/ */
public static final int TRANSPORT_WIFI_AWARE = 5; public static final int TRANSPORT_WIFI_AWARE = 5;
private static final int MIN_TRANSPORT = TRANSPORT_CELLULAR; /** @hide */
private static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE; public static final int MIN_TRANSPORT = TRANSPORT_CELLULAR;
/** @hide */
public static final int MAX_TRANSPORT = TRANSPORT_WIFI_AWARE;
private static final String[] TRANSPORT_NAMES = { private static final String[] TRANSPORT_NAMES = {
"CELLULAR", "CELLULAR",