diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-10-09 17:08:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-10-09 17:08:52 +0000 |
| commit | 30afd0b39e8f551648f00b74464a4d418a14f154 (patch) | |
| tree | b937e3a4d97bbd95aacaddaa5b2fbeddad5ef642 | |
| parent | 18bb69665bc0df1027218b4cd9452561b515ee08 (diff) | |
| parent | 2dc15a61af9a5e1e21ae34b66af9d801be4f8b7d (diff) | |
| download | TimeZoneData-30afd0b39e8f551648f00b74464a4d418a14f154.tar.gz | |
Merge "Track changes to dumpsys timezone output"
| -rw-r--r-- | testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ public class TimeZoneUpdateHostTest extends DeviceTestCase implements IBuildRece } 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); |