Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 999957ab authored by Howard Ro's avatar Howard Ro Committed by Automerger Merge Worker
Browse files

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

Change-Id: I390613a08d411427b94504e5da347bb2fe0da2dc
parents 7be1a3e8 ceb26028

apex/statsd/framework/java/android/app/StatsManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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.

cmds/statsd/tests/external/StatsCallbackPuller_test.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.