Merge changes Ic92b6d5c,I98b23b22,I0fb40d7b

am: 9c57accc45

Change-Id: Id1a9f8232ef3e08cf708d2406403fce3c59be9e5
This commit is contained in:
Hugo Benichi
2017-09-08 01:42:28 +00:00
committed by android-build-merger
3 changed files with 30 additions and 0 deletions

View File

@@ -201,9 +201,14 @@ public class IpConnectivityEventBuilderTest extends TestCase {
" time_ms: 1", " time_ms: 1",
" transports: 0", " transports: 0",
" default_network_event <", " default_network_event <",
" default_network_duration_ms: 0",
" final_score: 0",
" initial_score: 0",
" ip_support: 0",
" network_id <", " network_id <",
" network_id: 102", " network_id: 102",
" >", " >",
" no_default_network_duration_ms: 0",
" previous_network_id <", " previous_network_id <",
" network_id: 101", " network_id: 101",
" >", " >",
@@ -442,6 +447,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
" program_updates_all: 7", " program_updates_all: 7",
" program_updates_allowing_multicast: 3", " program_updates_allowing_multicast: 3",
" received_ras: 10", " received_ras: 10",
" total_packet_dropped: 0",
" total_packet_processed: 0",
" zero_lifetime_ras: 1", " zero_lifetime_ras: 1",
" >", " >",
">", ">",

View File

@@ -256,9 +256,14 @@ public class IpConnectivityMetricsTest {
" time_ms: 300", " time_ms: 300",
" transports: 0", " transports: 0",
" default_network_event <", " default_network_event <",
" default_network_duration_ms: 0",
" final_score: 0",
" initial_score: 0",
" ip_support: 0",
" network_id <", " network_id <",
" network_id: 102", " network_id: 102",
" >", " >",
" no_default_network_duration_ms: 0",
" previous_network_id <", " previous_network_id <",
" network_id: 101", " network_id: 101",
" >", " >",
@@ -308,6 +313,8 @@ public class IpConnectivityMetricsTest {
" program_updates_all: 7", " program_updates_all: 7",
" program_updates_allowing_multicast: 3", " program_updates_allowing_multicast: 3",
" received_ras: 10", " received_ras: 10",
" total_packet_dropped: 0",
" total_packet_processed: 0",
" zero_lifetime_ras: 1", " zero_lifetime_ras: 1",
" >", " >",
">", ">",
@@ -367,6 +374,10 @@ public class IpConnectivityMetricsTest {
" event_types: 1", " event_types: 1",
" event_types: 1", " event_types: 1",
" event_types: 2", " event_types: 2",
" getaddrinfo_error_count: 0",
" getaddrinfo_query_count: 0",
" gethostbyname_error_count: 0",
" gethostbyname_query_count: 0",
" latencies_ms: 3456", " latencies_ms: 3456",
" latencies_ms: 45", " latencies_ms: 45",
" latencies_ms: 638", " latencies_ms: 638",
@@ -384,6 +395,10 @@ public class IpConnectivityMetricsTest {
" dns_lookup_batch <", " dns_lookup_batch <",
" event_types: 1", " event_types: 1",
" event_types: 2", " event_types: 2",
" getaddrinfo_error_count: 0",
" getaddrinfo_query_count: 0",
" gethostbyname_error_count: 0",
" gethostbyname_query_count: 0",
" latencies_ms: 56", " latencies_ms: 56",
" latencies_ms: 34", " latencies_ms: 34",
" return_codes: 0", " return_codes: 0",

View File

@@ -111,6 +111,10 @@ public class NetdEventListenerServiceTest {
" event_types: 1", " event_types: 1",
" event_types: 2", " event_types: 2",
" event_types: 2", " event_types: 2",
" getaddrinfo_error_count: 0",
" getaddrinfo_query_count: 0",
" gethostbyname_error_count: 0",
" gethostbyname_query_count: 0",
" latencies_ms: 3456", " latencies_ms: 3456",
" latencies_ms: 267", " latencies_ms: 267",
" latencies_ms: 1230", " latencies_ms: 1230",
@@ -142,6 +146,10 @@ public class NetdEventListenerServiceTest {
" event_types: 2", " event_types: 2",
" event_types: 1", " event_types: 1",
" event_types: 1", " event_types: 1",
" getaddrinfo_error_count: 0",
" getaddrinfo_query_count: 0",
" gethostbyname_error_count: 0",
" gethostbyname_query_count: 0",
" latencies_ms: 56", " latencies_ms: 56",
" latencies_ms: 78", " latencies_ms: 78",
" latencies_ms: 14", " latencies_ms: 14",