Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Decrease default pull timeout to 2 seconds." into rvc-dev am: ceb2602851

Browse Source 
Change-Id: I390613a08d411427b94504e5da347bb2fe0da2dc
This commit is contained in:
Howard Ro
2020-05-30 10:17:46 +00:00
committed by Automerger Merge Worker
parent 7be1a3e8c0 ceb2602851
commit 999957ab38
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/statsd/framework/java/android/app/StatsManager.java
View File

@@ -120,7 +120,7 @@ public final class StatsManager {
/** /**
* @hide * @hide
**/ **/
@VisibleForTesting public static final long DEFAULT_TIMEOUT_MILLIS = 10_000L; // 10 seconds. @VisibleForTesting public static final long DEFAULT_TIMEOUT_MILLIS = 2_000L; // 2 seconds.
/** /**
* Constructor for StatsManagerClient. * Constructor for StatsManagerClient.

4
cmds/statsd/tests/external/StatsCallbackPuller_test.cpp vendored
View File

@@ -201,9 +201,9 @@ TEST_F(StatsCallbackPullerTest, RegisterAndTimeout) {
int64_t actualPullDurationNs = endTimeNs - startTimeNs; int64_t actualPullDurationNs = endTimeNs - startTimeNs;
// Pull should take at least the timeout amount of time, but should stop early because the delay // Pull should take at least the timeout amount of time, but should stop early because the delay
// is bigger. // is bigger. Make sure that the time is closer to the timeout, than to the intended delay.
EXPECT_LT(pullTimeoutNs, actualPullDurationNs); EXPECT_LT(pullTimeoutNs, actualPullDurationNs);
EXPECT_GT(pullDelayNs, actualPullDurationNs); EXPECT_GT(pullDelayNs / 5, actualPullDurationNs);
ASSERT_EQ(0, dataHolder.size()); ASSERT_EQ(0, dataHolder.size());
// Let the pull return and make sure that the dataHolder is not modified. // Let the pull return and make sure that the dataHolder is not modified.