summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2017-10-27 10:13:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-27 10:13:37 +0000
commit157e6ac39742fb5513660e3340fc03ac0196b39a (patch)
treed0f397c3ad6eed5522ed864b19e120d7b1febae0
parent9f3966174021114eaaead1f4a4edeffdcbe59238 (diff)
parentf40c3b96f2188b5e010cc0a6c53328912e36e22f (diff)
downloadTimeZoneData-157e6ac39742fb5513660e3340fc03ac0196b39a.tar.gz
Track changes to dumpsys timezone output
am: f40c3b96f2 Change-Id: If6b091ce399b5b7a0039fe0ca3e9ac794ee8c888
-rw-r--r--testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java6
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);