commit 649edce9d7efaab70a230430d2c9753ddfcdbb2d
author Neil Fuller <nfuller@google.com> Fri Oct 27 10:55:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 27 10:55:27 2017 +0000
tree b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent 184c8409dcab8adbec09ac47dc7bf2587e56cbb2
parent b0749eb70cc689b5d76d5e067cf819409df76b3e

Further fixes to OEM templates am: 5ea1946f81 am: 9f39661740
am: b0749eb70c  -s ours

Change-Id: I3a623f452648afffa2aa0e07e41627c6e5e1fc37

testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java

diff --git a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
index 71ae1d0..68fabc1 100644
--- a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
+++ b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
@@ -258,8 +258,10 @@
     }
 
     private void assertActiveRulesVersion(String expectedRulesVersion) throws Exception {
-        // Dumpsys reports the version reported by ICU and libcore, but they should always match.
-        String expectedActiveRulesVersion = expectedRulesVersion + "," + expectedRulesVersion;
+        // Dumpsys reports the version reported by ICU, ZoneInfoDB and TimeZoneFinder and they
+        // should always match.
+        String expectedActiveRulesVersion =
+                expectedRulesVersion + "," + expectedRulesVersion + "," + expectedRulesVersion;
 
         String actualActiveRulesVersion =
                 waitForNoOperationInProgressAndReturn(StateType.ACTIVE_RULES_VERSION);