Add boot image fingerprint to DeviceInfoCollector.
Test: unit tests
Bug: 196140637
Change-Id: I197fefe164aee03c0277e0a6aa464c3a297cb2fa
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
index 3c92d11..dc99609 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DeviceInfoCollector.java
@@ -54,6 +54,7 @@
private static final String DEVICE = "ro.product.device";
private static final String FINGERPRINT = "ro.build.fingerprint";
private static final String VENDOR_FINGERPRINT = "ro.vendor.build.fingerprint";
+ private static final String BOOTIMAGE_FINGERPRINT = "ro.bootimage.build.fingerprint";
private static final String ID = "ro.build.id";
private static final String MANUFACTURER = "ro.product.manufacturer";
private static final String MODEL = "ro.product.model";
@@ -136,7 +137,8 @@
VERSION_RELEASE,
VERSION_SDK,
VERSION_SECURITY_PATCH,
- VERSION_INCREMENTAL);
+ VERSION_INCREMENTAL,
+ BOOTIMAGE_FINGERPRINT);
// add device properties to the result with a prefix tag for each key
for (Entry<String, String> entry :
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
index e0d616b..de1f765 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/VtsDeviceInfoCollector.java
@@ -80,6 +80,7 @@
BUILD_KEYS.put("cts:build_vendor_fingerprint", "ro.vendor.build.fingerprint");
BUILD_KEYS.put("cts:build_vendor_manufacturer", "ro.product.vendor.manufacturer");
BUILD_KEYS.put("cts:build_vendor_model", "ro.product.vendor.model");
+ BUILD_KEYS.put("cts:build_bootimage_fingerprint", "ro.bootimage.build.fingerprint");
BUILD_LEGACY_PROPERTIES.put(
"ro.product.vendor.manufacturer", "ro.vendor.product.manufacturer");
