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

Commit 9e3a623f authored May 25, 2020 by Stanislav Zholnin

resolve merge conflicts of 25a656d9 to master

Change-Id: Ie6353043b4abcaccea368a0ee961f65f12ec397c

parents 3bca3b98 25a656d9

core/java/android/app/TEST_MAPPING

+0 −9

Original line number	Diff line number	Diff line
		@@ -22,15 +22,6 @@
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsAppOps2TestCases"
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsStatsdHostTestCases",
		"options": [
		{
		"include-filter": "android.cts.statsd.atom.UidAtomTests"
		}
		]
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "FrameworksServicesTests",

services/core/java/com/android/server/appop/TEST_MAPPING

+0 −8

Original line number	Diff line number	Diff line
		@@ -46,14 +46,6 @@
		"include-filter": "android.app.cts.ActivityManagerApi29Test"
		}
		]
		},
		{
		"name": "CtsStatsdHostTestCases",
		"options": [
		{
		"include-filter": "android.cts.statsd.atom.UidAtomTests"
		}
		]
		}
		]
		}