diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-15 20:06:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-15 20:06:31 +0000 |
| commit | 8ba2b21715f8af81b88d8d888a96ee9b0452b641 (patch) | |
| tree | 85b0863dee86228e199d1feef3559e4537d94a9b | |
| parent | 4dae3cbdac6c733cc2329b52c7efdb546f6331b3 (diff) | |
| parent | 2cf55786291b89d5a6d86ddd2c35bd5991af8a4f (diff) | |
| download | cts-8ba2b21715f8af81b88d8d888a96ee9b0452b641.tar.gz | |
Merge "Snap for 8292414 from 36c35bf759266c6d6bbce72dbc63689fa11a477f to pie-cts-release" into pie-cts-release
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java index 7839109b6dc..b0bff55ba3e 100644 --- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java +++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java @@ -29,6 +29,8 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.HashSet; +import java.util.Arrays; +import java.util.List; import java.util.Set; public class BuildVersionTest extends TestCase { @@ -36,7 +38,7 @@ public class BuildVersionTest extends TestCase { private static final String LOG_TAG = "BuildVersionTest"; private static final int EXPECTED_SDK = 28; private static final String EXPECTED_BUILD_VARIANT = "user"; - private static final String EXPECTED_TAG = "release-keys"; + private static final String EXPECTED_KEYS = "release-keys"; private static final String PLATFORM_VERSIONS_FILE = "platform_versions.txt"; @SuppressWarnings("deprecation") @@ -83,7 +85,10 @@ public class BuildVersionTest extends TestCase { String[] buildNumberVariant = fingerprintSegs[4].split(":"); String buildVariant = buildNumberVariant[1]; assertEquals("Variant", EXPECTED_BUILD_VARIANT, buildVariant); - assertEquals("Tag", EXPECTED_TAG, fingerprintSegs[5]); + + List<String> buildTagsList = Arrays.asList(fingerprintSegs[5].split(",")); + boolean containsReleaseKeys = buildTagsList.contains(EXPECTED_KEYS); + assertTrue("Keys", containsReleaseKeys); } private void assertNotEmpty(String value) { diff --git a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestFirstActivity.java b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestFirstActivity.java index 839a2903190..7f175637126 100644 --- a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestFirstActivity.java +++ b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestFirstActivity.java @@ -31,6 +31,7 @@ public class UiAutomationTestFirstActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); setContentView(R.layout.ui_automation_test); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON diff --git a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestSecondActivity.java b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestSecondActivity.java index 4ba0f743ce1..5a0b6d86153 100644 --- a/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestSecondActivity.java +++ b/tests/tests/uiautomation/src/android/app/uiautomation/cts/UiAutomationTestSecondActivity.java @@ -30,6 +30,7 @@ public class UiAutomationTestSecondActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); setContentView(R.layout.ui_automation_test); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |