LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Wakeup packet events: addressing a few comments" am: efd7e6d7a9 am: ca88876b58

Browse Source 
am: 19625788a1

Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95
This commit is contained in:
Hugo Benichi
2017-09-19 07:36:12 +00:00
committed by android-build-merger
parent f49156fd33 ca88876b58
commit 17d5101e99
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java
View File

@@ -512,7 +512,7 @@ public class IpConnectivityEventBuilderTest {
stats.nonApplicationWakeups = 1; stats.nonApplicationWakeups = 1;
stats.rootWakeups = 2; stats.rootWakeups = 2;
stats.systemWakeups = 3; stats.systemWakeups = 3;
stats.unroutedWakeups = 3; stats.noUidWakeups = 3;
IpConnectivityEvent got = IpConnectivityEventBuilder.toProto(stats); IpConnectivityEvent got = IpConnectivityEventBuilder.toProto(stats);
String want = String.join("\n", String want = String.join("\n",
@@ -526,11 +526,11 @@ public class IpConnectivityEventBuilderTest {
" wakeup_stats <", " wakeup_stats <",
" application_wakeups: 5", " application_wakeups: 5",
" duration_sec: 0", " duration_sec: 0",
" no_uid_wakeups: 3",
" non_application_wakeups: 1", " non_application_wakeups: 1",
" root_wakeups: 2", " root_wakeups: 2",
" system_wakeups: 3", " system_wakeups: 3",
" total_wakeups: 14", " total_wakeups: 14",
" unrouted_wakeups: 3",
" >", " >",
">", ">",
"version: 2\n"); "version: 2\n");

4
tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
View File

@@ -423,11 +423,11 @@ public class IpConnectivityMetricsTest {
" wakeup_stats <", " wakeup_stats <",
" application_wakeups: 2", " application_wakeups: 2",
" duration_sec: 0", " duration_sec: 0",
" no_uid_wakeups: 0",
" non_application_wakeups: 0", " non_application_wakeups: 0",
" root_wakeups: 0", " root_wakeups: 0",
" system_wakeups: 1", " system_wakeups: 1",
" total_wakeups: 3", " total_wakeups: 3",
" unrouted_wakeups: 0",
" >", " >",
">", ">",
"events <", "events <",
@@ -439,11 +439,11 @@ public class IpConnectivityMetricsTest {
" wakeup_stats <", " wakeup_stats <",
" application_wakeups: 1", " application_wakeups: 1",
" duration_sec: 0", " duration_sec: 0",
" no_uid_wakeups: 1",
" non_application_wakeups: 0", " non_application_wakeups: 0",
" root_wakeups: 0", " root_wakeups: 0",
" system_wakeups: 2", " system_wakeups: 2",
" total_wakeups: 4", " total_wakeups: 4",
" unrouted_wakeups: 1",
" >", " >",
">", ">",
"version: 2\n"); "version: 2\n");

4
tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -163,11 +163,11 @@ public class NetdEventListenerServiceTest {
" wakeup_stats <", " wakeup_stats <",
" application_wakeups: 3", " application_wakeups: 3",
" duration_sec: 0", " duration_sec: 0",
" no_uid_wakeups: 0",
" non_application_wakeups: 0", " non_application_wakeups: 0",
" root_wakeups: 0", " root_wakeups: 0",
" system_wakeups: 2", " system_wakeups: 2",
" total_wakeups: 5", " total_wakeups: 5",
" unrouted_wakeups: 0",
" >", " >",
">", ">",
"events <", "events <",
@@ -179,11 +179,11 @@ public class NetdEventListenerServiceTest {
" wakeup_stats <", " wakeup_stats <",
" application_wakeups: 2", " application_wakeups: 2",
" duration_sec: 0", " duration_sec: 0",
" no_uid_wakeups: 2",
" non_application_wakeups: 1", " non_application_wakeups: 1",
" root_wakeups: 2", " root_wakeups: 2",
" system_wakeups: 3", " system_wakeups: 3",
" total_wakeups: 10", " total_wakeups: 10",
" unrouted_wakeups: 2",
" >", " >",
">", ">",
"version: 2\n"); "version: 2\n");