commit 0126f3d17e3312540a8965d70acadf5f548fa62a
author Ryan Longair <rlongair@google.com> Tue Jul 03 14:19:27 2018 -0700
committer Ryan Longair <rlongair@google.com> Tue Jul 03 22:42:32 2018 +0000
tree 07d2af2faa36ac74ee6b61e57b2b3c37f7ac54af
parent 605d5b13c91d9c29775db657ba35ae30b3582311

STS retry fix again... ensure the unedited fingerprint is always being
used to authenticate results.

Bug: 79381250
Test: run sts-engbuild --retry 1 using the files uploaded in
b/79381250#comment26

common/util/src/com/android/compatibility/common/util/ResultHandler.java

diff --git a/common/util/src/com/android/compatibility/common/util/ResultHandler.java b/common/util/src/com/android/compatibility/common/util/ResultHandler.java
index 5b4bf22..5b14a50 100644
--- a/common/util/src/com/android/compatibility/common/util/ResultHandler.java
+++ b/common/util/src/com/android/compatibility/common/util/ResultHandler.java
@@ -270,7 +270,9 @@
                         // If the fingerprint was altered, then checksum against the fingerprint
                         // originally reported
                         Boolean checksumMismatch = invocationUseChecksum &&
-                             !checksumReporter.containsTestResult(test, module, reportFingerprint);
+                             !checksumReporter.containsTestResult(test, module, reportFingerprint)
+                             && (fingerprintWasAltered ? !checksumReporter.containsTestResult(
+                                 test, module, unalteredFingerprint) : true);
                         if (checksumMismatch) {
                             test.removeResult();
                         }
@@ -281,7 +283,9 @@
                 // If the fingerprint was altered, then checksum against the fingerprint
                 // originally reported
                 Boolean checksumMismatch = invocationUseChecksum &&
-                     !checksumReporter.containsModuleResult(module, reportFingerprint);
+                     !checksumReporter.containsModuleResult(module, reportFingerprint) &&
+                     (fingerprintWasAltered ? !checksumReporter.containsModuleResult(
+                         module, unalteredFingerprint) : true);
                 if (checksumMismatch) {
                     module.initializeDone(false);
                 }