From 6a6eca858bb67a582e5b4d5229ec51b605e61433 Mon Sep 17 00:00:00 2001 From: Tony Mak Date: Mon, 24 Mar 2025 08:25:57 -0700 Subject: DO NOT MERGE: Allow OEMs to backport EXECUTE_APP_FUNCTIONS_TRUSTED before A16. This permission is now removed in Android 16. However, OEMs backported a different snapshots of Android 16 and so we need to get the CTS passing with and without this permission in Android 15. Bug: 402647068 Test: presubmit Merged-In: I69f829007fa7466f2f7f7e0ba5dde0d26e770219 Change-Id: I0fa30a2b2ea058f59ec04cac352ee9e135eea8ca --- .../src/android/permissionpolicy/cts/PermissionPolicyTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/PermissionPolicyTest.java b/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/PermissionPolicyTest.java index 5ce9df514..93d0f17ae 100644 --- a/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/PermissionPolicyTest.java +++ b/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/PermissionPolicyTest.java @@ -76,6 +76,9 @@ public class PermissionPolicyTest { private static final String EXECUTE_APP_FUNCTIONS_PERMISSION = "android.permission.EXECUTE_APP_FUNCTIONS"; + private static final String EXECUTE_APP_FUNCTIONS_TRUSTED_PERMISSION = + "android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED"; + private static final String LOG_TAG = "PermissionProtectionTest"; private static final String PLATFORM_PACKAGE_NAME = "android"; @@ -536,6 +539,10 @@ public class PermissionPolicyTest { case EXECUTE_APP_FUNCTIONS_PERMISSION: // OEMs are allowed to backport this permission before Android 16. return true; + case EXECUTE_APP_FUNCTIONS_TRUSTED_PERMISSION: + // This permission is removed in Android 16. OEMs are + // allowed to backport this permission before Android 16. + return true; default: return false; } -- cgit v1.2.3-59-g8ed1b