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

Commit 4b210659 authored by Tony Mak's avatar Tony Mak
Browse files

Remove EXECUTE_APP_FUNCTIONS_TRUSTED 

Bug: 393122219
Test: atest CtsAppFunctionTestCases
Flag: android.app.appfunctions.flags.enable_app_function_manager

Change-Id: I1038766dc66375c5f9038d88d06b934ed0abc758
parent c51fb14c

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -8893,8 +8893,8 @@ package android.app.appfunctions { 
  }















  @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {













    method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void executeAppFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.app.appfunctions.ExecuteAppFunctionResponse,android.app.appfunctions.AppFunctionException>);













    method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);













    method @RequiresPermission(value=android.Manifest.permission.EXECUTE_APP_FUNCTIONS, conditional=true) public void executeAppFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull android.os.OutcomeReceiver<android.app.appfunctions.ExecuteAppFunctionResponse,android.app.appfunctions.AppFunctionException>);













    method @RequiresPermission(value=android.Manifest.permission.EXECUTE_APP_FUNCTIONS, conditional=true) public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);















    method public void isAppFunctionEnabled(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);















    method public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);















    field public static final int APP_FUNCTION_STATE_DEFAULT = 0; // 0x0

























core/api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -150,7 +150,6 @@ package android {













    field @FlaggedApi("com.android.window.flags.untrusted_embedding_any_app_permission") public static final String EMBED_ANY_APP_IN_UNTRUSTED_MODE = "android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE";















    field @FlaggedApi("android.content.pm.emergency_install_permission") public static final String EMERGENCY_INSTALL_PACKAGES = "android.permission.EMERGENCY_INSTALL_PACKAGES";















    field public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission.ENTER_CAR_MODE_PRIORITIZED";













    field @FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final String EXECUTE_APP_FUNCTIONS_TRUSTED = "android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED";















    field public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission.EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";















    field public static final String FORCE_BACK = "android.permission.FORCE_BACK";















    field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";

























core/java/android/app/appfunctions/AppFunctionManager.java



+11
−25




























Original line number
Diff line number
Diff line








@@ -72,10 +72,10 @@ import java.util.concurrent.Executor;













 * <p>To execute an app function, the caller app can retrieve the {@code functionIdentifier} from















 * the {@code AppFunctionStaticMetadata} document and use it to build an {@link















 * ExecuteAppFunctionRequest}. Then, invoke {@link #executeAppFunction} with the request to execute













 * the app function. Callers need the {@code android.permission.EXECUTE_APP_FUNCTIONS} or {@code













 * android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED} permission to execute app functions from other













 * apps. An app can always execute its own app functions and doesn't need these permissions.













 * AppFunction SDK provides a convenient way to achieve this and is the preferred method.













 * the app function. Callers need the {@code android.permission.EXECUTE_APP_FUNCTIONS} permission to













 * execute app functions from other apps. An app can always execute its own app functions and













 * doesn't need these permissions. AppFunction SDK provides a convenient way to achieve this and













 * is the preferred method.















 *















 * <h3>Example</h3>















 *










@@ -141,32 +141,24 @@ public final class AppFunctionManager {













     * Executes the app function.















     *















     * <p>Note: Applications can execute functions they define. To execute functions defined in













     * another component, apps would need to have {@code













     * android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED} or {@code













     * android.permission.EXECUTE_APP_FUNCTIONS}.













     * another component, apps would need to have the permission













     * {@code android.permission.EXECUTE_APP_FUNCTIONS}.















     *















     * @param request the request to execute the app function















     * @param executor the executor to run the callback















     * @param cancellationSignal the cancellation signal to cancel the execution.















     * @param callback the callback to receive the function execution result or error.















     *     <p>If the calling app does not own the app function or does not have {@code













     *     android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED} or {@code















     *     android.permission.EXECUTE_APP_FUNCTIONS}, the execution result will contain {@code















     *     AppFunctionException.ERROR_DENIED}.













     *     <p>If the caller only has {@code android.permission.EXECUTE_APP_FUNCTIONS} but the













     *     function requires {@code android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED}, the execution













     *     <p>If the caller only has {@code android.permission.EXECUTE_APP_FUNCTIONS}, the execution















     *     result will contain {@code AppFunctionException.ERROR_DENIED}















     *     <p>If the function requested for execution is disabled, then the execution result will















     *     contain {@code AppFunctionException.ERROR_DISABLED}















     *     <p>If the cancellation signal is issued, the operation is cancelled and no response is















     *     returned to the caller.















     */













    @RequiresPermission(













            anyOf = {













                Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED,













                Manifest.permission.EXECUTE_APP_FUNCTIONS













            },













            conditional = true)













    @RequiresPermission(value = Manifest.permission.EXECUTE_APP_FUNCTIONS, conditional = true)















    @UserHandleAware















    public void executeAppFunction(















            @NonNull ExecuteAppFunctionRequest request,










@@ -222,9 +214,8 @@ public final class AppFunctionManager {













     * Returns a boolean through a callback, indicating whether the app function is enabled.















     *















     * <p>This method can only check app functions owned by the caller, or those where the caller













     * has visibility to the owner package and holds either the {@link













     * Manifest.permission#EXECUTE_APP_FUNCTIONS} or {@link













     * Manifest.permission#EXECUTE_APP_FUNCTIONS_TRUSTED} permission.













     * has visibility to the owner package and holds the













     * {@link Manifest.permission#EXECUTE_APP_FUNCTIONS} permission.















     *















     * <p>If the operation fails, the callback's {@link OutcomeReceiver#onError} is called with















     * errors:









@@ -241,12 +232,7 @@ public final class AppFunctionManager {













     * @param executor the executor to run the request















     * @param callback the callback to receive the function enabled check result















     */













    @RequiresPermission(













            anyOf = {













                Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED,













                Manifest.permission.EXECUTE_APP_FUNCTIONS













            },













            conditional = true)













    @RequiresPermission(value = Manifest.permission.EXECUTE_APP_FUNCTIONS, conditional = true)















    public void isAppFunctionEnabled(















            @NonNull String functionIdentifier,















            @NonNull String targetPackage,

































core/java/android/app/appfunctions/AppFunctionManagerHelper.java



+2
−3




























Original line number
Diff line number
Diff line








@@ -54,9 +54,8 @@ public class AppFunctionManagerHelper {













     * Returns (through a callback) a boolean indicating whether the app function is enabled.















     *















     * This method can only check app functions owned by the caller, or those where the caller













     * has visibility to the owner package and holds either the {@link













     * Manifest.permission#EXECUTE_APP_FUNCTIONS} or {@link













     * Manifest.permission#EXECUTE_APP_FUNCTIONS_TRUSTED} permission.













     * has visibility to the owner package and holds the {@link













     * Manifest.permission#EXECUTE_APP_FUNCTIONS} permission.















     *















     * <p>If operation fails, the callback's {@link OutcomeReceiver#onError} is called with errors:















     *

































core/java/android/app/appfunctions/AppFunctionRuntimeMetadata.java



+3
−5




























Original line number
Diff line number
Diff line








@@ -90,8 +90,7 @@ public class AppFunctionRuntimeMetadata extends GenericDocument {













     * we need to have per-package app function schemas.















     *















     * <p>This schema should be set visible to callers from the package owner itself and for callers













     * with {@link android.Manifest.permission#EXECUTE_APP_FUNCTIONS} or {@link













     * android.Manifest.permission#EXECUTE_APP_FUNCTIONS_TRUSTED} permissions.













     * with the permission {@link android.Manifest.permission#EXECUTE_APP_FUNCTIONS}.















     *















     * @param packageName The package name to create a schema for.















     */









@@ -105,9 +104,8 @@ public class AppFunctionRuntimeMetadata extends GenericDocument {













    /**















     * Creates a parent schema for all app function runtime schemas.















     *













     * <p>This schema should be set visible to the owner itself and for callers with {@link













     * android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED} or {@link













     * android.permission.EXECUTE_APP_FUNCTIONS} permissions.













     * <p>This schema should be set visible to the owner itself and for callers with













     * the permission {@link android.permission.EXECUTE_APP_FUNCTIONS}.















     */















    public static AppSearchSchema createParentAppFunctionRuntimeSchema() {















        return getAppFunctionRuntimeSchemaBuilder(RUNTIME_SCHEMA_TYPE).build();