Add Build Brand and Manufacturer to Report Header
Bug 3132855
Change-Id: I44731bed37e285688c135d23dcf63b3216fbddd0
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
index 5a2fd6a..78d9597 100644
--- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
+++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -66,6 +66,7 @@
private static final String BUILD_TYPE = "build_type";
private static final String BUILD_MODEL = "build_model";
private static final String BUILD_BRAND = "build_brand";
+ private static final String BUILD_MANUFACTURER = "build_manufacturer";
private static final String BUILD_BOARD = "build_board";
private static final String BUILD_DEVICE = "build_device";
private static final String PRODUCT_NAME = "product_name";
@@ -88,6 +89,7 @@
addResult(PRODUCT_NAME, Build.PRODUCT);
addResult(BUILD_DEVICE, Build.DEVICE);
addResult(BUILD_BOARD, Build.BOARD);
+ addResult(BUILD_MANUFACTURER, Build.MANUFACTURER);
addResult(BUILD_BRAND, Build.BRAND);
addResult(BUILD_MODEL, Build.MODEL);
addResult(BUILD_TYPE, Build.TYPE);
diff --git a/tools/host/src/com/android/cts/TestDevice.java b/tools/host/src/com/android/cts/TestDevice.java
index 7b314af..23c1f71 100644
--- a/tools/host/src/com/android/cts/TestDevice.java
+++ b/tools/host/src/com/android/cts/TestDevice.java
@@ -399,6 +399,7 @@
public static final String BUILD_FINGERPRINT = "build_fingerprint";
public static final String BUILD_TAGS = "build_tags";
public static final String BUILD_TYPE = "build_type";
+ public static final String BUILD_MANUFACTURER = "build_manufacturer";
public static final String BUILD_MODEL = "build_model";
public static final String BUILD_BRAND = "build_brand";
public static final String BUILD_BOARD = "build_board";
@@ -603,6 +604,15 @@
}
/**
+ * Get the build manufacturer.
+ *
+ * @return The build manufacturer.
+ */
+ public String getBuildManufacturer() {
+ return mInfoMap.get(BUILD_MANUFACTURER);
+ }
+
+ /**
* Get the build brand.
*
* @return The build brand.
diff --git a/tools/host/src/com/android/cts/TestSessionLog.java b/tools/host/src/com/android/cts/TestSessionLog.java
index 99a15bf..22da746 100644
--- a/tools/host/src/com/android/cts/TestSessionLog.java
+++ b/tools/host/src/com/android/cts/TestSessionLog.java
@@ -48,7 +48,7 @@
private static final String ATTRIBUTE_KNOWN_FAILURE = "KnownFailure";
public static final String CTS_RESULT_FILE_NAME = "testResult.xml";
- private static final String CTS_RESULT_FILE_VERSION = "1.7";
+ private static final String CTS_RESULT_FILE_VERSION = "1.8";
static final String ATTRIBUTE_STARTTIME = "starttime";
static final String ATTRIBUTE_ENDTIME = "endtime";
@@ -343,6 +343,9 @@
setAttribute(doc, devInfoNode,
DeviceParameterCollector.BUILD_MODEL, bldInfo.getBuildModel());
setAttribute(doc, devInfoNode,
+ DeviceParameterCollector.BUILD_MANUFACTURER,
+ bldInfo.getBuildManufacturer());
+ setAttribute(doc, devInfoNode,
DeviceParameterCollector.BUILD_BRAND, bldInfo.getBuildBrand());
setAttribute(doc, devInfoNode,
DeviceParameterCollector.BUILD_BOARD, bldInfo.getBuildBoard());
diff --git a/tools/host/src/res/cts_result.xsd b/tools/host/src/res/cts_result.xsd
index 91568d9..a0672b5 100644
--- a/tools/host/src/res/cts_result.xsd
+++ b/tools/host/src/res/cts_result.xsd
@@ -16,8 +16,8 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://compatibility.android.com/cts_result/1.7"
- xmlns="http://compatibility.android.com/cts_result/1.7"
+ targetNamespace="http://compatibility.android.com/cts_result/1.8"
+ xmlns="http://compatibility.android.com/cts_result/1.8"
elementFormDefault="qualified">
<xs:element name="TestResult">
@@ -57,6 +57,7 @@
<xs:attribute name="buildName" type="xs:string"/>
<xs:attribute name="buildVersion" type="xs:string"/>
<xs:attribute name="build_board" type="xs:string"/>
+ <xs:attribute name="build_manufacturer" type="xs:string"/>
<xs:attribute name="build_brand" type="xs:string"/>
<xs:attribute name="build_device" type="xs:string"/>
<xs:attribute name="build_fingerprint" type="xs:string"/>
diff --git a/tools/host/src/res/cts_result.xsl b/tools/host/src/res/cts_result.xsl
index bd82f82..039f69e 100644
--- a/tools/host/src/res/cts_result.xsl
+++ b/tools/host/src/res/cts_result.xsl
@@ -70,6 +70,18 @@
</TD>
</TR>
<TR>
+ <TD class="rowtitle">Build Brand</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_brand"/>
+ </TD>
+ </TR>
+ <TR>
+ <TD class="rowtitle">Build Manufacturer</TD>
+ <TD>
+ <xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@build_manufacturer"/>
+ </TD>
+ </TR>
+ <TR>
<TD class="rowtitle">Device ID</TD>
<TD>
<xsl:value-of select="TestResult/DeviceInfo/BuildInfo/@deviceID"/>
