Snap for 5335706 from 52bff87fa8f9413d81d8af0d258fa4ea209f84ec to qt-release
Change-Id: Iba1a8831b9e1a059e5c48b9ae9b75fa866aa0448
diff --git a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
index e3300bb..0170d80 100644
--- a/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
+++ b/testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java
@@ -180,7 +180,7 @@
Thread.sleep(10000);
}
}
- assertActiveRulesVersion(getSystemRulesVersion());
+ assertActiveRulesVersion(getBaseRulesVersion());
assertEquals(STAGED_OPERATION_NONE, getStagedOperationType());
}
@@ -308,8 +308,8 @@
return waitForNoOperationInProgressAndReturn(StateType.STAGED_OPERATION_TYPE);
}
- private String getSystemRulesVersion() throws Exception {
- return waitForNoOperationInProgressAndReturn(StateType.SYSTEM_RULES_VERSION);
+ private String getBaseRulesVersion() throws Exception {
+ return waitForNoOperationInProgressAndReturn(StateType.BASE_RULES_VERSION);
}
private boolean isOperationInProgress() {
@@ -365,7 +365,7 @@
private enum StateType {
OPERATION_IN_PROGRESS,
- SYSTEM_RULES_VERSION,
+ BASE_RULES_VERSION,
CURRENT_INSTALL_STATE,
CURRENTLY_INSTALLED_VERSION,
STAGED_OPERATION_TYPE,
@@ -377,8 +377,8 @@
switch (this) {
case OPERATION_IN_PROGRESS:
return "p";
- case SYSTEM_RULES_VERSION:
- return "s";
+ case BASE_RULES_VERSION:
+ return "b";
case CURRENT_INSTALL_STATE:
return "c";
case CURRENTLY_INSTALLED_VERSION:
