summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2023-02-21 17:45:12 +0800
committer Chris Li <lihongyu@google.com> 2023-02-21 11:37:17 +0000
commitd8063a3884a6c2f3262fc9933b88f18a20116873 (patch)
tree8592eb9890bf7aadf51acc9bc9f492e48b2aa916
parent005bb48f7c6423b3d7dcf373a3e0868f3185381c (diff)
[RESTRICT AUTOMERGE] Fix incorrect use of WindowMetrics.density
The API is newly introduced in Android U, but is unexpectedly used for AOSP master because it has CODENAME of U. This test would fail internally because Settings use WM Jetpack that use CODENAME to guard the API before U is finalized. Bug: 269760296 Test: SafetyCenterActivityTest #launchActivity_withFlagDisabled_opensSettings Change-Id: I2c5c64acfb50de0b27370781ae149c8cf0f87d0f
-rw-r--r--tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterActivityTest.kt13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterActivityTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterActivityTest.kt
index 0e6896604..343b15296 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterActivityTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterActivityTest.kt
@@ -19,6 +19,7 @@ package android.safetycenter.cts
import android.content.Context
import android.content.Intent
import android.content.Intent.ACTION_SAFETY_CENTER
+import android.os.Build
import android.os.Build.VERSION_CODES.TIRAMISU
import android.safetycenter.cts.testing.SafetyCenterFlags
import android.safetycenter.cts.testing.SafetyCenterFlags.deviceSupportsSafetyCenter
@@ -29,11 +30,13 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
import com.android.compatibility.common.util.ApiTest
import com.android.compatibility.common.util.UiAutomatorUtils.waitFindObject
-import java.util.regex.Pattern
+import org.junit.Assume.assumeFalse
import org.junit.Assume.assumeTrue
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
+import java.util.Locale
+import java.util.regex.Pattern
@RunWith(AndroidJUnit4::class)
@SdkSuppress(minSdkVersion = TIRAMISU, codeName = "Tiramisu")
@@ -58,6 +61,9 @@ class SafetyCenterActivityTest {
@Test
fun launchActivity_withFlagDisabled_opensSettings() {
+ // TODO(b/269760296) this is to fix test failure caused by incorrect using of U API. Remove
+ // in next release.
+ assumeFalse(isCodeNameU())
SafetyCenterFlags.setSafetyCenterEnabled(false)
startSafetyCenterActivity()
@@ -71,4 +77,9 @@ class SafetyCenterActivityTest {
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
}
+
+ private fun isCodeNameU(): Boolean {
+ val buildCodeName = Build.VERSION.CODENAME.toUpperCase(Locale.ROOT)
+ return buildCodeName.compareTo("UPSIDEDOWNCAKE") >= 0
+ }
}