Merge "Avoid including com.android.server.power.stats in presubmit twice" into main (23e53c1c) · Commits · e / os / android_frameworks_base

core/java/android/os/TEST_MAPPING

+14 −2

Original line number	Diff line number	Diff line
		@@ -52,8 +52,20 @@
		],
		"name": "FrameworksServicesTests",
		"options": [
		{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" },
		{ "include-filter": "com.android.server.power.stats.BatteryStatsTests" }
		{ "include-filter": "com.android.server.am.BatteryStatsServiceTest" }
		]
		},
		{
		"file_patterns": [
		"BatteryStats[^/]*\\.java",
		"BatteryUsageStats[^/]*\\.java",
		"PowerComponents\\.java",
		"[^/]BatteryConsumer[^/]\\.java"
		],
		"name": "FrameworksServicesTests",
		"options": [
		{ "include-filter": "com.android.server.power.stats" },
		{ "exclude-filter": "com.android.server.power.stats.BatteryStatsTests" }
		]
		},
		{

+3 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"},
		{"exclude-filter": "com.android.server.power.BatteryStatsTests"},
		{"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
		{"exclude-annotation": "androidx.test.filters.FlakyTest"}
		]
		@@ -38,7 +39,8 @@
		{
		"name": "FrameworksServicesTests",
		"options": [
		{"include-filter": "com.android.server.power"}
		{"include-filter": "com.android.server.power"},
		{"exclude-filter": "com.android.server.power.BatteryStatsTests"}
		]
		}
		]