Track RulesManagerService frameworks/base changes am: f4cc71826e am: 732a706905android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release

am: 4d908688c3

Change-Id: I1b678da3e4aabe2adc2ad6e09b570381690fb047

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: