Track RulesManagerService frameworks/base changesandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-release

Required to support RulesManagerService changes in
frameworks/base.

Bug: 119293618
Bug: 113373927
Test: See related frameworks/base/ change.
Change-Id: Ia9544528ad1d43bfe28a2c162c61d4ebeb186484

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: