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

Commit a0beec3c authored by Richard MacGregor's avatar Richard MacGregor Committed by Android (Google) Code Review
Browse files

Merge changes from topic "appfunc-ui-flag-and-api" into main 

* changes:
  Create intent actions for AppFunction access UI
  Add flag for appfunctions access ui
parents a4dca810 e322b1bf

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -8954,6 +8954,9 @@ package android.app.appfunctions { 
    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 @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_AGENT_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_AGENT_APP_FUNCTION_ACCESS";

    field @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_APP_FUNCTION_ACCESS";

    field @FlaggedApi("android.permission.flags.app_function_access_ui_enabled") public static final String ACTION_MANAGE_TARGET_APP_FUNCTION_ACCESS = "android.app.appfunctions.action.MANAGE_TARGET_APP_FUNCTION_ACCESS";

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

    field public static final int APP_FUNCTION_STATE_DISABLED = 2; // 0x2

    field public static final int APP_FUNCTION_STATE_ENABLED = 1; // 0x1

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

+50 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app.appfunctions; 


import static android.app.appfunctions.AppFunctionException.ERROR_SYSTEM_ERROR;

import static android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER;

import static android.permission.flags.Flags.FLAG_APP_FUNCTION_ACCESS_UI_ENABLED;



import android.Manifest;

import android.annotation.CallbackExecutor;
@@ -25,6 +26,7 @@ import android.annotation.FlaggedApi; 
import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SystemService;

import android.annotation.UserHandleAware;

import android.app.appfunctions.AppFunctionManagerHelper.AppFunctionNotFoundException;
@@ -90,6 +92,54 @@ import java.util.concurrent.Executor; 
@SystemService(Context.APP_FUNCTION_SERVICE)

public final class AppFunctionManager {



    /**

     * Activity action: Launch UI to manage App Function access.

     * <p>

     * Input: Nothing.

     * </p>

     * <p>

     * Output: Nothing.

     * </p>

     */

    @FlaggedApi(FLAG_APP_FUNCTION_ACCESS_UI_ENABLED)

    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_APP_FUNCTION_ACCESS =

            "android.app.appfunctions.action.MANAGE_APP_FUNCTION_ACCESS";



    /**

     * Activity action: Launch UI to manage App Function access for a specific agent app.

     * <p>

     * Input: {@link android.content.Intent#EXTRA_PACKAGE_NAME} specifies the package whose access

     * will be managed by the launched UI.

     * </p>

     * <p>

     * Output: Nothing.

     * </p>

     *

     * @see android.content.Intent#EXTRA_PACKAGE_NAME

     */

    @FlaggedApi(FLAG_APP_FUNCTION_ACCESS_UI_ENABLED)

    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_AGENT_APP_FUNCTION_ACCESS =

            "android.app.appfunctions.action.MANAGE_AGENT_APP_FUNCTION_ACCESS";



    /**

     * Activity action: Launch UI to manage App Function access for a specific target app.

     * <p>

     * Input: {@link android.content.Intent#EXTRA_PACKAGE_NAME} specifies the package whose access

     * will be managed by the launched UI.

     * </p>

     * <p>

     * Output: Nothing.

     * </p>

     *

     * @see android.content.Intent#EXTRA_PACKAGE_NAME

     */

    @FlaggedApi(FLAG_APP_FUNCTION_ACCESS_UI_ENABLED)

    @SdkConstant(SdkConstant.SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGE_TARGET_APP_FUNCTION_ACCESS =

            "android.app.appfunctions.action.MANAGE_TARGET_APP_FUNCTION_ACCESS";



    /**

     * The default state of the app function. Call {@link #setAppFunctionEnabled} with this to reset

     * enabled state to the default value.

core/java/android/permission/flags.aconfig

+9 −0
Original line number Diff line number Diff line
@@ -550,3 +550,12 @@ flag { 
    description: "This flag is used to enable the supervision role"

    bug: "401490610"

}



flag {

    name: "app_function_access_ui_enabled"

    is_exported: true

    namespace: "permissions"

    description: "This flag gates the UI for the App Function Access. This includes settings screens, request dialogs and related intents"

    bug: "413087113"

}