diff options
| author | 2024-04-19 13:11:04 +0000 | |
|---|---|---|
| committer | 2024-04-19 13:11:04 +0000 | |
| commit | 85cfaa2a7efa165cb39ca76529a48e50cdbbb1fd (patch) | |
| tree | 568136acd48f66dc7949a0f67285a4003b5f2be4 | |
| parent | cfcdce6b82b167c2b111df768cbe88011909838b (diff) | |
| parent | 9e9847e6ac8fe21e3f4018d6a765e5270d5a2d0f (diff) | |
Merge "TEST_MAPPING: re-enable ScanningSettingsTest in presubmit" into main am: 7171819017 am: 9e9847e6ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3024983
Change-Id: I0c44ea353a18e28dfabad5e753d92b7685bd175f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | location/TEST_MAPPING | 7 | ||||
| -rw-r--r-- | services/core/java/com/android/server/power/batterysaver/TEST_MAPPING | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/location/TEST_MAPPING b/location/TEST_MAPPING index f5deb2ba3e07..10da632e7b6f 100644 --- a/location/TEST_MAPPING +++ b/location/TEST_MAPPING @@ -2,12 +2,7 @@ "presubmit": [ { "name": "CtsLocationFineTestCases", - "options": [ - { - // TODO: Wait for test to deflake - b/293934372 - "exclude-filter":"android.location.cts.fine.ScanningSettingsTest" - } - ] + "options": [] }, { "name": "CtsLocationCoarseTestCases" diff --git a/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING b/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING index c091b8e68236..eb91a72c127a 100644 --- a/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING +++ b/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING @@ -5,12 +5,7 @@ }, { "name": "CtsLocationFineTestCases", - "options": [ - { - // TODO: Wait for test to deflake - b/293934372 - "exclude-filter":"android.location.cts.fine.ScanningSettingsTest" - } - ] + "options": [] }, { "name": "CtsLocationNoneTestCases" |