From 5ea1946f8174bdd32fc014eb9f98af94e13f3a47 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Wed, 4 Oct 2017 11:41:30 +0100
Subject: Further fixes to OEM templates

Some clarification and white space fixes that were
missed from commit
9e06a0a119e710e043e5f1c376429afec52c01d3.

Bug: 65165603
Test: None, documentation only. None of the files are
      included in the build

Change-Id: Iec3d679348924d988fce77af5a5b8b90f09840a4
Merged-In: Iec3d679348924d988fce77af5a5b8b90f09840a4
(cherry picked from commit 18bb69665bc0df1027218b4cd9452561b515ee08)
---
 oem_template/xts/AndroidTest.xml | 4 ++--
 oem_template/xts/README.oem      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/oem_template/xts/AndroidTest.xml b/oem_template/xts/AndroidTest.xml
index cd86156..5fa472a 100644
--- a/oem_template/xts/AndroidTest.xml
+++ b/oem_template/xts/AndroidTest.xml
@@ -21,8 +21,8 @@
         <!-- OEM-INSTRUCTION: Change this to match the package name of the data app -->
         <option name="set-option" value="oem-data-app-package-name:com.oemcorp.android.timezone.data" />
         <!-- OEM-INSTRUCTION: Change this to match the name of the target used to include the test .apks -->
-	<!--
-	   This has to match the name of the .apk files included in the test
+        <!--
+           This has to match the name of the .apk files included in the test
            suite. For example, if the value below is "oem-data-app-apk-prefix:TimeZoneData"
            the test will look for TimeZoneData_test1.apk and TimeZoneData_test2.apk, etc. during tests.
           -->
diff --git a/oem_template/xts/README.oem b/oem_template/xts/README.oem
index 307724d..a20045b 100644
--- a/oem_template/xts/README.oem
+++ b/oem_template/xts/README.oem
@@ -5,5 +5,9 @@ OEM-INSTRUCTION See below for the purpose of this directory and changes to make.
 This directory contains a suggested structure for CTS-like host-side tests for checking the
 time zone update feature has been integrated properly.
 
-These tests are not included in CTS because the OEM must perform their own integration and
-provide their own OEM-specific signed time zone data app .apks under their own package.
+These tests are not included in CTS because the OEM must perform their own feature
+integration and sign their own TimeZoneData app; no CTS-provided TimeZoneData app would be
+installable on an OEM's device.
+
+To pass, OEMs must provide their own OEM-specific signed time zone data app .apks under the
+correct package name and configure the test config.
-- 
cgit v1.2.3