diff options
| author | 2024-04-19 12:49:28 +0000 | |
|---|---|---|
| committer | 2024-04-19 12:49:28 +0000 | |
| commit | 9e9847e6ac8fe21e3f4018d6a765e5270d5a2d0f (patch) | |
| tree | c1ccfcb2cfb9d407ade662f052519aa6b90a8b98 | |
| parent | 93b6f4b02837e61e3508b5c8cea8eb368a61d09b (diff) | |
| parent | 7171819017ce7b2b50de6dc7ddcc30ca98c0cbc4 (diff) | |
Merge "TEST_MAPPING: re-enable ScanningSettingsTest in presubmit" into main am: 7171819017
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3024983
Change-Id: Ia1b374e26eb040824a2f7111e4d53f544e8e9473
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" |