commit 84db2e40e1fc3a9d2e5091845abb51a04ee95793
author Tej Singh <singhtejinder@google.com> Mon Jun 01 19:14:09 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 01 19:14:09 2020 +0000
tree a87553b5c618658857ad13718e2d9db49d27a203
parent ee418ecb66f08cfe5a0375f2608bd9edd3f7c4c3
parent c95f7819017eeeccfb78cab728c3c443546affed

Merge "Retry pullfinish with empty payload if call fails" 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 0b9dd52..478cae7 100644
--- a/libstats/pull/stats_pull_atom_callback.cpp
+++ b/libstats/pull/stats_pull_atom_callback.cpp
@@ -131,7 +131,11 @@
             parcels.push_back(std::move(p));
         }
 
-        resultReceiver->pullFinished(atomTag, success, parcels);
+        Status status = resultReceiver->pullFinished(atomTag, success, parcels);
+        if (!status.isOk()) {
+            std::vector<StatsEventParcel> emptyParcels;
+            resultReceiver->pullFinished(atomTag, /*success=*/false, emptyParcels);
+        }
         for (int i = 0; i < statsEventList.data.size(); i++) {
             AStatsEvent_release(statsEventList.data[i]);
         }