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

Commit e30ed059 authored Sep 24, 2019 by Philip P. Moltmann Committed by Android (Google) Code Review Sep 24, 2019

Merge "Run RuntimePermissionProperty tests when runtime permissions change"

parents 1c060ac5 889ecd27

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,10 @@ package android {
		field public static final String WRITE_OBB = "android.permission.WRITE_OBB";
		}

		public static final class Manifest.permission_group {
		field public static final String UNDEFINED = "android.permission-group.UNDEFINED";
		}

		public static final class R.bool {
		field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004
		}

core/java/android/app/TEST_MAPPING

+9 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,15 @@
		"include-filter": "com.android.server.appop"
		}
		]
		},
		{
		"file_patterns": ["(/\|^)AppOpsManager.java"],
		"name": "CtsPermission2TestCases",
		"options": [
		{
		"include-filter": "android.permission2.cts.RuntimePermissionProperties"
		}
		]
		}
		],
		"postsubmit": [

core/res/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -643,6 +643,7 @@
		<!-- Grouping for platform runtime permissions is not accessible to apps
		@hide
		@SystemApi
		@TestApi
		-->
		<permission-group android:name="android.permission-group.UNDEFINED"
		android:priority="100" />

core/res/TEST_MAPPING

+3 −0

Original line number	Diff line number	Diff line
		@@ -5,6 +5,9 @@
		"options": [
		{
		"include-filter": "android.permission2.cts.PermissionPolicyTest#platformPermissionPolicyIsUnaltered"
		},
		{
		"include-filter": "android.permission2.cts.RuntimePermissionProperties"
		}
		]
		}

data/etc/TEST_MAPPING

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		{
		"presubmit": [
		{
		"file_patterns": ["(/\|^)platform.xml"],
		"name": "CtsPermission2TestCases",
		"options": [
		{
		"include-filter": "android.permission2.cts.RuntimePermissionProperties"
		}
		]
		}
		]
		}