summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2024-02-13 15:08:43 +0000
committer Pavel Grafov <pgrafov@google.com> 2024-02-15 01:39:59 +0000
commite175085b4870a3b51da8f995a28410a250d6c479 (patch)
tree33eb48720c4781fb940e9077f36da55bc7153e9b
parent36c28a843e2a42780147e3b347714152490bbcbf (diff)
Allow DPMRH to control audit logging
Also added it to shell for CTS LOW_COVERAGE_REASON=XML Bug: 295324350 Test: TH Change-Id: I5b249f68f994129dfbaa4101f9695c9ad6be3338
-rw-r--r--PermissionController/res/xml/roles.xml3
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml8
2 files changed, 11 insertions, 0 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 39c7a98cf..ba2be5ecf 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -683,6 +683,8 @@
<permission name="android.permission.ALWAYS_UPDATE_WALLPAPER" minSdkVersion="35" />
<permission name="android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE"
minSdkVersion="35" />
+ <permission name="android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING"
+ minSdkVersion="35" />
</permissions>
</role>
@@ -1362,6 +1364,7 @@
<permission name="android.permission.MANAGE_DEVICE_POLICY_CAMERA_TOGGLE" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_MICROPHONE_TOGGLE" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION" minSdkVersion="35" />
+ <permission name="android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING" minSdkVersion="35" />
</permissions>
</role>
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index 9020d9bfe..af7091d8c 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -3573,6 +3573,14 @@
<permission android:name="android.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING"
android:protectionLevel="internal|role" />
+ <!-- Allows an application to use audit logging API.
+ @hide
+ @SystemApi
+ @FlaggedApi("android.app.admin.flags.security_log_v2_enabled")
+ -->
+ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING"
+ android:protectionLevel="internal|role" />
+
<!-- Allows an application to set policy related to system updates.
<p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is
required to call APIs protected by this permission on users different to the calling user.