commit 6e060471c1651dc98862ca54d9817b4fcfb12923
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 04 20:12:25 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jan 04 20:12:25 2024 +0000
tree 3dda2bec6da6d959a6929db86e8a81237830a2d5
parent 6dfde9d8594d2c7770d3771aefe67828e8a3e1cc
parent 1b17e5d48147fc9697ecf885c3c933f525502649

Snap for 11274957 from 1b17e5d48147fc9697ecf885c3c933f525502649 to mainline-art-release

Change-Id: Iaa481163e133b56d596a393b3037899a3030d23b

apk/tests/Android.bp

diff --git a/apk/tests/Android.bp b/apk/tests/Android.bp
index ba4d2f7..d42a49d 100644
--- a/apk/tests/Android.bp
+++ b/apk/tests/Android.bp
@@ -82,6 +82,7 @@
         "androidx.test.ext.junit",
         "androidx.test.ext.truth",
         "androidx.test.rules",
+        "compatibility-device-util-axt",
         "mockito-kotlin2"
     ],
     resource_dirs: ["main_res"],

apk/tests/src/com/android/healthconnect/controller/tests/utils/LocalDateTimeFormatterTest.kt

diff --git a/apk/tests/src/com/android/healthconnect/controller/tests/utils/LocalDateTimeFormatterTest.kt b/apk/tests/src/com/android/healthconnect/controller/tests/utils/LocalDateTimeFormatterTest.kt
index 47ff0f0..f28af15 100644
--- a/apk/tests/src/com/android/healthconnect/controller/tests/utils/LocalDateTimeFormatterTest.kt
+++ b/apk/tests/src/com/android/healthconnect/controller/tests/utils/LocalDateTimeFormatterTest.kt
@@ -3,6 +3,9 @@
 import android.content.Context
 import android.content.res.Configuration
 import android.os.LocaleList
+import android.provider.Settings.System
+import com.android.compatibility.common.util.UserSettings
+import com.android.compatibility.common.util.UserSettings.Namespace
 import com.android.healthconnect.controller.utils.LocalDateTimeFormatter
 import com.google.common.truth.Truth.assertThat
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -24,7 +27,9 @@
     @get:Rule val hiltRule = HiltAndroidRule(this)
 
     @Inject @ApplicationContext lateinit var context: Context
+    private lateinit var systemSettings: UserSettings
 
+    private var previousTimeFormat: String? = null
     private var previousDefaultTimeZone: TimeZone? = null
     private var previousLocale: Locale? = null
 
@@ -34,6 +39,13 @@
     fun setup() {
         hiltRule.inject()
 
+        systemSettings = UserSettings(context, Namespace.SYSTEM)
+        previousTimeFormat = systemSettings.get(System.TIME_12_24)
+        if (previousTimeFormat != null) {
+            // Clear setting so locale-defined time format is used.
+            systemSettings.syncSet(System.TIME_12_24, null)
+        }
+
         previousDefaultTimeZone = TimeZone.getDefault()
         previousLocale = Locale.getDefault()
 
@@ -43,6 +55,9 @@
 
     @After
     fun tearDown() {
+        if (previousTimeFormat != null) {
+            systemSettings.syncSet(System.TIME_12_24, previousTimeFormat)
+        }
         TimeZone.setDefault(previousDefaultTimeZone)
         previousLocale?.let { locale -> Locale.setDefault(locale) }
     }