From ad8d6c7ec29118406eaa6c3297911922dcafcf2d Mon Sep 17 00:00:00 2001
From: Jolanda Verhoef <JolandaVerhoef@users.noreply.github.com>
Date: Fri, 18 Mar 2022 12:16:17 +0000
Subject: [PATCH] [TestConfigurationSample] Change API26 to API27 as 26 is not
 supported

---
 .github/workflows/TestConfigurationSample.yaml            | 8 ++++----
 TestConfigurationSample/app/build.gradle                  | 4 ++--
 .../testing/testconfigurationsample/MainActivityTests.kt  | 4 ++--
 .../testconfigurationsample/TestDeviceAnnotations.kt      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/TestConfigurationSample.yaml b/.github/workflows/TestConfigurationSample.yaml
index 8727e5ffb..c05967d28 100644
--- a/.github/workflows/TestConfigurationSample.yaml
+++ b/.github/workflows/TestConfigurationSample.yaml
@@ -81,11 +81,11 @@ jobs:
             ~/.android/gradle/avd/dev30_aosp_x86_64_Pixel_2.*
           key: pixel2api30
 
-      - name: Cache pixel2api26 system image
+      - name: Cache pixel2api27 system image
         uses: actions/cache@v2
         with:
-          path: ~/.android/gradle/avd/dev26_aosp_x86_Pixel_2.*
-          key: pixel2api26
+          path: ~/.android/gradle/avd/dev27_aosp_x86_Pixel_2.*
+          key: pixel2api27
 
       - name: Cache nexus9api29 system image
         uses: actions/cache@v2
@@ -99,7 +99,7 @@ jobs:
 
       - name: Run regression tests
         working-directory: ${{ env.SAMPLE_PATH }}
-        run: ./gradlew -i pixel2api26DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi26 -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+        run: ./gradlew -i pixel2api27DebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.example.android.testing.testconfigurationsample.TestDeviceApi27 -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
 
       - name: Run large screen tests
         working-directory: ${{ env.SAMPLE_PATH }}
diff --git a/TestConfigurationSample/app/build.gradle b/TestConfigurationSample/app/build.gradle
index 7c6d502c5..b881d3d20 100644
--- a/TestConfigurationSample/app/build.gradle
+++ b/TestConfigurationSample/app/build.gradle
@@ -56,9 +56,9 @@ android {
                 systemImageSource = "aosp"
                 abi = "x86"
             }
-            pixel2api26(com.android.build.api.dsl.ManagedVirtualDevice) {
+            pixel2api27(com.android.build.api.dsl.ManagedVirtualDevice) {
                 device = "Pixel 2"
-                apiLevel = 26
+                apiLevel = 27
                 systemImageSource = "aosp"
                 abi = "x86"
             }
diff --git a/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/MainActivityTests.kt b/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/MainActivityTests.kt
index c9be09878..e18e15862 100644
--- a/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/MainActivityTests.kt
+++ b/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/MainActivityTests.kt
@@ -65,8 +65,8 @@ class MainActivityTests {
      *
      * See the Github Actions setup of this project for an example.
      */
-    @Test @TestDeviceApi26
-    fun regressionTestKnownIssueApi26() {
+    @Test @TestDeviceApi27
+    fun regressionTestKnownIssueApi27() {
         // Add instrumented tests here
         runBlocking { delay(10000) }
         assertTrue(true)
diff --git a/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/TestDeviceAnnotations.kt b/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/TestDeviceAnnotations.kt
index fab97f5c5..bb34a7aa6 100644
--- a/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/TestDeviceAnnotations.kt
+++ b/TestConfigurationSample/app/src/androidTest/java/com/example/android/testing/testconfigurationsample/TestDeviceAnnotations.kt
@@ -16,9 +16,9 @@
 package com.example.android.testing.testconfigurationsample
 
 /**
- * Annotate tests with this annotation when testing API 26 regression bugs.
+ * Annotate tests with this annotation when testing API 27 regression bugs.
  */
-annotation class TestDeviceApi26
+annotation class TestDeviceApi27
 
 /**
  * Annotate tests with this annotation when testing large-screen specific features.