commit f893bd8756a2a1adba1bb87ace1cfaba7a4cf9fa
author Tej Singh <singhtejinder@google.com> Mon Jun 01 19:14:10 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 01 19:14:10 2020 +0000
tree 787a289340ec166773367684634bb34c285ddb04
parent 7ac1347ca45509583153210a9179af2d09b6dc47
parent e22b75a4be4d5a5bfcfe97c6d17b54e923ff5e2e

Merge "Retry pullfinish with empty payload if call fails" into rvc-dev

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

diff --git a/apex/framework/java/android/app/StatsManager.java b/apex/framework/java/android/app/StatsManager.java
index d2c6c09..a7d2057 100644
--- a/apex/framework/java/android/app/StatsManager.java
+++ b/apex/framework/java/android/app/StatsManager.java
@@ -561,7 +561,15 @@
                     try {
                         resultReceiver.pullFinished(atomTag, success, parcels);
                     } catch (RemoteException e) {
-                        Log.w(TAG, "StatsPullResultReceiver failed for tag " + mAtomId);
+                        Log.w(TAG, "StatsPullResultReceiver failed for tag " + mAtomId
+                                + " due to TransactionTooLarge. Calling pullFinish with no data");
+                        StatsEventParcel[] emptyData = new StatsEventParcel[0];
+                        try {
+                            resultReceiver.pullFinished(atomTag, /*success=*/false, emptyData);
+                        } catch (RemoteException nestedException) {
+                            Log.w(TAG, "StatsPullResultReceiver failed for tag " + mAtomId
+                                    + " with empty payload");
+                        }
                     }
                 });
             } finally {