From d4a29081c1787879ecdd069e6d0e6a34776866cb Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 19 Sep 2017 13:15:26 +0900 Subject: [PATCH] Wakeup packet events: addressing a few comments This patch addresses a few post-submit comment for commits f562ac34a51dc and 60c9f63b66921. Bug: 34901696 Bug: 62179647 Test: runtest frameworks-net Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30 --- .../server/connectivity/IpConnectivityEventBuilderTest.java | 4 ++-- .../server/connectivity/IpConnectivityMetricsTest.java | 4 ++-- .../server/connectivity/NetdEventListenerServiceTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index f72a1c638e..262417620c 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -512,7 +512,7 @@ public class IpConnectivityEventBuilderTest { stats.nonApplicationWakeups = 1; stats.rootWakeups = 2; stats.systemWakeups = 3; - stats.unroutedWakeups = 3; + stats.noUidWakeups = 3; IpConnectivityEvent got = IpConnectivityEventBuilder.toProto(stats); String want = String.join("\n", @@ -526,11 +526,11 @@ public class IpConnectivityEventBuilderTest { " wakeup_stats <", " application_wakeups: 5", " duration_sec: 0", + " no_uid_wakeups: 3", " non_application_wakeups: 1", " root_wakeups: 2", " system_wakeups: 3", " total_wakeups: 14", - " unrouted_wakeups: 3", " >", ">", "version: 2\n"); diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index ede5988cdc..a395c480f5 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -423,11 +423,11 @@ public class IpConnectivityMetricsTest { " wakeup_stats <", " application_wakeups: 2", " duration_sec: 0", + " no_uid_wakeups: 0", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 1", " total_wakeups: 3", - " unrouted_wakeups: 0", " >", ">", "events <", @@ -439,11 +439,11 @@ public class IpConnectivityMetricsTest { " wakeup_stats <", " application_wakeups: 1", " duration_sec: 0", + " no_uid_wakeups: 1", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 2", " total_wakeups: 4", - " unrouted_wakeups: 1", " >", ">", "version: 2\n"); diff --git a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index 2b105e5c92..6723601fc5 100644 --- a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -163,11 +163,11 @@ public class NetdEventListenerServiceTest { " wakeup_stats <", " application_wakeups: 3", " duration_sec: 0", + " no_uid_wakeups: 0", " non_application_wakeups: 0", " root_wakeups: 0", " system_wakeups: 2", " total_wakeups: 5", - " unrouted_wakeups: 0", " >", ">", "events <", @@ -179,11 +179,11 @@ public class NetdEventListenerServiceTest { " wakeup_stats <", " application_wakeups: 2", " duration_sec: 0", + " no_uid_wakeups: 2", " non_application_wakeups: 1", " root_wakeups: 2", " system_wakeups: 3", " total_wakeups: 10", - " unrouted_wakeups: 2", " >", ">", "version: 2\n");