summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2023-12-01 09:36:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-12-01 09:36:33 +0000
commit1d6a854d2d69367b59c04dd0671ee9551b5dabfe (patch)
treeeec1697f1406c5c3f99ecde3f1fc95bca24dad1b
parentbf2ca6d4d3787e9b046a9ef8438155019e28d398 (diff)
parent4971e07291854777a8992044e77cb6b40d142e96 (diff)
Merge "Switch "postsubmit" to "presubmit" after soak" into main
-rw-r--r--core/java/android/service/timezone/TEST_MAPPING5
-rw-r--r--services/core/java/com/android/server/timezonedetector/TEST_MAPPING5
2 files changed, 2 insertions, 8 deletions
diff --git a/core/java/android/service/timezone/TEST_MAPPING b/core/java/android/service/timezone/TEST_MAPPING
index e5910ea4a1fa..bf46ff2ffe06 100644
--- a/core/java/android/service/timezone/TEST_MAPPING
+++ b/core/java/android/service/timezone/TEST_MAPPING
@@ -7,10 +7,7 @@
"include-filter": "android.service."
}
]
- }
- ],
- // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.
- "postsubmit": [
+ },
{
"name": "CtsLocationTimeZoneManagerHostTest"
}
diff --git a/services/core/java/com/android/server/timezonedetector/TEST_MAPPING b/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
index 358618a71cbc..004d79964354 100644
--- a/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
+++ b/services/core/java/com/android/server/timezonedetector/TEST_MAPPING
@@ -10,10 +10,7 @@
},
{
"name": "FrameworksTimeServicesTests"
- }
- ],
- // TODO(b/182461754): Change to "presubmit" when go/test-mapping-slo-guide allows.
- "postsubmit": [
+ },
{
"name": "CtsLocationTimeZoneManagerHostTest"
}