commit b148a6d572f520402901571d3925c405b7ca0508
author Neil Fuller <nfuller@google.com> Fri Oct 27 10:33:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 27 10:33:45 2017 +0000
tree b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642
parent b0749eb70cc689b5d76d5e067cf819409df76b3e
parent 157e6ac39742fb5513660e3340fc03ac0196b39a

Track changes to dumpsys timezone output am: f40c3b96f2
am: 157e6ac397

Change-Id: I88136258b2dc68521ca4bddac4dcd73db74d807c

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);