diff options
| author | Neil Fuller <nfuller@google.com> | 2019-02-25 10:43:16 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-25 10:43:16 -0800 |
| commit | 4d908688c32d1fc69bc091078397add3206e838f (patch) | |
| tree | 9690a871f88eb440a7604ed57b0a00ee6fe6314d | |
| parent | cd18025fdd90188edbe168b68b642f9852a1dc1e (diff) | |
| parent | 732a706905948982da8ae636b282db4c8ea9c3a9 (diff) | |
| download | TimeZoneData-4d908688c32d1fc69bc091078397add3206e838f.tar.gz | |
Track RulesManagerService frameworks/base changes am: f4cc71826e
am: 732a706905
Change-Id: Ie9a49868290fd8ccaf845fe8cb2704e66e1db9dc
| -rw-r--r-- | testing/xts/src/com/android/timezone/xts/TimeZoneUpdateHostTest.java | 12 |
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: |