commit edcb088b1ea55676e1c9deb639c468f4d8f3ef59
author Julien Desprez <jdesprez@google.com> Thu Jul 09 11:04:08 2020 -0700
committer Julien Desprez <jdesprez@google.com> Thu Jul 09 11:04:08 2020 -0700
tree fd48514bda560143522ea2f3d107a212c124e209
parent e2034d5d0f3f909e28a03efc7149a12a2188a48f

Ensure out of sequence call on ProtoResultReporter doesn't crash

Avoid NPE if called out of sequence, handle it gracefully.

Test: unit tests
Bug: 159850199
Change-Id: I2a237173d7695570792f4b3877243c51f81bcdcb

src/com/android/tradefed/result/proto/ProtoResultReporter.java

diff --git a/src/com/android/tradefed/result/proto/ProtoResultReporter.java b/src/com/android/tradefed/result/proto/ProtoResultReporter.java
index f7119f3..5e70f63 100644
--- a/src/com/android/tradefed/result/proto/ProtoResultReporter.java
+++ b/src/com/android/tradefed/result/proto/ProtoResultReporter.java
@@ -483,6 +483,10 @@
 
     @Override
     public final void logAssociation(String dataName, LogFile logFile) {
+        if (mLatestChild == null || mLatestChild.isEmpty()) {
+            CLog.w("Skip logging '%s' logAssociation called out of sequence.", dataName);
+            return;
+        }
         TestRecord.Builder current = mLatestChild.peek();
         Map<String, Any> fullmap = new HashMap<>();
         fullmap.putAll(current.getArtifactsMap());