commit 103f1ea4e99897ed22aa5c070ba3809779caf69d
author Julien Desprez <jdesprez@google.com> Tue May 14 15:28:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 14 15:28:54 2019 -0700
tree 76ad207e89544866b936b3215b5afef2ae842313
parent c17acb4504281f674d4912222d37226b1a04bccd
parent 77846085c03be24d3f96afd65b91bf62bb2ec4d3

Ensure we use the version.txt when available
am: 77846085c0

Change-Id: I93e0933edda125921e2d5986c468622ef9a81763

common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java

diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
index 2216b2a..a45325a 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/build/CompatibilityBuildProvider.java
@@ -32,6 +32,7 @@
 import com.android.tradefed.testtype.IInvocationContextReceiver;
 import com.android.tradefed.testtype.suite.TestSuiteInfo;
 import com.android.tradefed.util.FileUtil;
+import com.android.tradefed.util.VersionParser;
 
 import java.io.File;
 import java.io.IOException;
@@ -296,7 +297,12 @@
      * Return the SuiteInfo build number generated at build time. Exposed for testing.
      */
     protected String getSuiteInfoBuildNumber() {
-        return TestSuiteInfo.getInstance().getBuildNumber();
+        String buildNumber = TestSuiteInfo.getInstance().getBuildNumber();
+        String versionFile = VersionParser.fetchVersion();
+        if (versionFile != null) {
+            buildNumber = versionFile;
+        }
+        return buildNumber;
     }
 
     /**