Snap for 5335706 from 52bff87fa8f9413d81d8af0d258fa4ea209f84ec to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid10-gsi

Change-Id: Iba1a8831b9e1a059e5c48b9ae9b75fa866aa0448

1 files changed, 6 insertions, 6 deletions

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 @@ public class TimeZoneUpdateHostTest implements IDeviceTest, IBuildReceiver {
                 Thread.sleep(10000);
             }
         }
-        assertActiveRulesVersion(getSystemRulesVersion());
+        assertActiveRulesVersion(getBaseRulesVersion());
         assertEquals(STAGED_OPERATION_NONE, getStagedOperationType());
     }
 
@@ -308,8 +308,8 @@ public class TimeZoneUpdateHostTest implements IDeviceTest, IBuildReceiver {
         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 @@ public class TimeZoneUpdateHostTest implements IDeviceTest, IBuildReceiver {
 
     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 @@ public class TimeZoneUpdateHostTest implements IDeviceTest, IBuildReceiver {
             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: