Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 965a2122 authored Aug 20, 2024 by Ronald Braunstein Committed by Automerger Merge Worker Aug 20, 2024

Merge "Migrate FrameworksServicesTests options to Android.bp" into main am: e7f900f0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3225805

Change-Id: I01df182cab8a1fa2375cb1243a310f0a5e485c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 636ac3e9 e7f900f0

apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING

+1 −6

Original line number	Diff line number	Diff line
		@@ -16,12 +16,7 @@
		]
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.job"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.LargeTest"}
		]
		"name": "FrameworksServicesTests_com_android_server_job_Presubmit"
		}
		],
		"postsubmit": [

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+1 −5

Original line number	Diff line number	Diff line
		@@ -17,11 +17,7 @@
		]
		},
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.usage"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		"name": "FrameworksServicesTests_com_android_server_usage_Presubmit"
		}
		],
		"postsubmit": [

core/java/android/app/TEST_MAPPING

+1 −6

Original line number	Diff line number	Diff line
		@@ -29,12 +29,7 @@
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "FrameworksServicesTests",
		"options": [
		{
		"include-filter": "com.android.server.appop"
		}
		]
		"name": "FrameworksServicesTests_android_server_appop"
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],

core/java/android/os/TEST_MAPPING

+1 −4

Original line number	Diff line number	Diff line
		@@ -82,10 +82,7 @@
		"PowerComponents\\.java",
		"[^/]BatteryConsumer[^/]\\.java"
		],
		"name": "FrameworksServicesTests",
		"options": [
		{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" }
		]
		"name": "FrameworksServicesTests_battery_stats"
		},
		{
		"file_patterns": [

core/java/com/android/internal/os/TEST_MAPPING

+1 −4

Original line number	Diff line number	Diff line
		@@ -28,10 +28,7 @@
		"Kernel[^/]*\\.java",
		"[^/]Power[^/]\\.java"
		],
		"name": "FrameworksServicesTests",
		"options": [
		{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" }
		]
		"name": "FrameworksServicesTests_battery_stats"
		},
		{
		"file_patterns": [