commit ee418ecb66f08cfe5a0375f2608bd9edd3f7c4c3
author Yifan Hong <elsk@google.com> Sun May 31 21:47:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun May 31 21:47:14 2020 +0000
tree 86fdfab43c8a98ab668727b76295776986ff86b4
parent 3ec696d0ce1b534af827341e767f0d0050deaefb
parent 8d996c4d3f4c3262fa1c02091d86f229e901e661

Merge "libsnapshot: proto use correct index" into rvc-dev

libstats/pull/stats_pull_atom_callback.cpp

diff --git a/libstats/pull/stats_pull_atom_callback.cpp b/libstats/pull/stats_pull_atom_callback.cpp
index 2d184bd..0b9dd52 100644
--- a/libstats/pull/stats_pull_atom_callback.cpp
+++ b/libstats/pull/stats_pull_atom_callback.cpp
@@ -47,7 +47,7 @@
 }
 
 static const int64_t DEFAULT_COOL_DOWN_MILLIS = 1000LL;  // 1 second.
-static const int64_t DEFAULT_TIMEOUT_MILLIS = 10000LL;   // 10 seconds.
+static const int64_t DEFAULT_TIMEOUT_MILLIS = 2000LL;    // 2 seconds.
 
 struct AStatsManager_PullAtomMetadata {
     int64_t cool_down_millis;

libstats/pull/tests/pull_atom_metadata_test.cpp

diff --git a/libstats/pull/tests/pull_atom_metadata_test.cpp b/libstats/pull/tests/pull_atom_metadata_test.cpp
index cf19303..abc8e47 100644
--- a/libstats/pull/tests/pull_atom_metadata_test.cpp
+++ b/libstats/pull/tests/pull_atom_metadata_test.cpp
@@ -21,7 +21,7 @@
 namespace {
 
 static const int64_t DEFAULT_COOL_DOWN_MILLIS = 1000LL;  // 1 second.
-static const int64_t DEFAULT_TIMEOUT_MILLIS = 10000LL;   // 10 seconds.
+static const int64_t DEFAULT_TIMEOUT_MILLIS = 2000LL;    // 2 seconds.
 
 }  // anonymous namespace