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

Commit 5e9d4d99 authored by Nate Myren's avatar Nate Myren Committed by Android (Google) Code Review
Browse files

Merge "Rename AppFunctionManager APIs" into main

parents b5bdd07c 2037a002

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -9093,10 +9093,10 @@ package android.app.appfunctions { 














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















    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 @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public int getSelfAppFunctionAccessRequestState(@NonNull String);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public int getAccessRequestState(@NonNull String);















    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 @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public void revokeSelfAppFunctionAccess(@NonNull String);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public void revokeSelfAccess(@NonNull String);















    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_api_enabled") public static final int ACCESS_REQUEST_STATE_DENIED = 1; // 0x1















    field @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public static final int ACCESS_REQUEST_STATE_GRANTED = 0; // 0x0

























core/api/system-current.txt



+3
−3




























Original line number
Diff line number
Diff line








@@ -1771,11 +1771,11 @@ package android.app.ambientcontext {













package android.app.appfunctions {





























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













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public int getAppFunctionAccessFlags(@NonNull String, @NonNull String);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(value=android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS, conditional=true) public int getAppFunctionAccessRequestState(@NonNull String, @NonNull String);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public int getAccessFlags(@NonNull String, @NonNull String);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(value=android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS, conditional=true) public int getAccessRequestState(@NonNull String, @NonNull String);















    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public java.util.List<java.lang.String> getValidAgents();















    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public java.util.List<java.lang.String> getValidTargets();













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public void updateAppFunctionAccessFlags(@NonNull String, @NonNull String, int, int);













    method @FlaggedApi("android.permission.flags.app_function_access_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_APP_FUNCTION_ACCESS) public void updateAccessFlags(@NonNull String, @NonNull String, int, int);















    field @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public static final int ACCESS_FLAG_OTHER_DENIED = 4; // 0x4















    field @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public static final int ACCESS_FLAG_OTHER_GRANTED = 2; // 0x2















    field @FlaggedApi("android.permission.flags.app_function_access_api_enabled") public static final int ACCESS_FLAG_PREGRANTED = 1; // 0x1

























core/java/android/app/appfunctions/AppFunctionAccessServiceInterface.java



+7
−7




























Original line number
Diff line number
Diff line








@@ -28,22 +28,22 @@ public interface AppFunctionAccessServiceInterface {





























    /** @see AppFunctionManager#getAppFunctionAccessRequestState(String, String)  */















    @AppFunctionManager.AppFunctionAccessState













    int getAppFunctionAccessRequestState(@NonNull String agentPackageName, int agentUserId,













    int getAccessRequestState(@NonNull String agentPackageName, int agentUserId,















            @NonNull String targetPackageName, int targetUserId);





























    /** @see AppFunctionManager#getAppFunctionAccessFlags(String, String)  */













    /** @see AppFunctionManager#getAccessFlags(String, String)  */















    @AppFunctionManager.AppFunctionAccessFlags













    int getAppFunctionAccessFlags(@NonNull String agentPackageName, int agentUserId,













    int getAccessFlags(@NonNull String agentPackageName, int agentUserId,















            @NonNull String targetPackageName, int targetUserId);





























    /** @see AppFunctionManager#updateAppFunctionAccessFlags(String, String, int, int)  */













    boolean updateAppFunctionAccessFlags(@NonNull String agentPackageName, int agentUserId,













    /** @see AppFunctionManager#updateAccessFlags(String, String, int, int)  */













    boolean updateAccessFlags(@NonNull String agentPackageName, int agentUserId,















            @NonNull String targetPackageName, int targetUserId,















            @AppFunctionManager.AppFunctionAccessFlags int flagMask,















            @AppFunctionManager.AppFunctionAccessFlags int flags) throws IllegalArgumentException;





























    /** @see AppFunctionManager#revokeSelfAppFunctionAccess(String) */













    void revokeSelfAppFunctionAccess(@NonNull String targetPackageName);













    /** @see AppFunctionManager#revokeSelfAccess(String) */













    void revokeSelfAccess(@NonNull String targetPackageName);































    /** Set the agent allowlist */















    void setAgentAllowlist(@NonNull List<SignedPackage> agentAllowlist);

































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



+15
−15




























Original line number
Diff line number
Diff line








@@ -539,7 +539,7 @@ public final class AppFunctionManager {





























    /**















     * Checks whether the given agent has access to app functions of the given target app, or if













     * the access is not {@link #getSelfAppFunctionAccessRequestState valid}. Requires the













     * the access is not {@link #getAccessRequestState(String) valid}. Requires the















     * {@link Manifest.permission.MANAGE_APP_FUNCTION_ACCESS} permission if the















     * {@param agentPackageName} is not the calling app.















     *









@@ -553,10 +553,10 @@ public final class AppFunctionManager {













    @FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)















    @RequiresPermission(value = MANAGE_APP_FUNCTION_ACCESS, conditional = true)















    @AppFunctionAccessState













    public int getAppFunctionAccessRequestState(@NonNull String agentPackageName,













    public int getAccessRequestState(@NonNull String agentPackageName,















            @NonNull String targetPackageName) {















        try {













            return mService.getAppFunctionAccessRequestState(agentPackageName,













            return mService.getAccessRequestState(agentPackageName,















                    mContext.getUserId(), targetPackageName, mContext.getUserId());















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();









@@ -578,14 +578,14 @@ public final class AppFunctionManager {













     */















    @FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)















    @AppFunctionAccessState













    public int getSelfAppFunctionAccessRequestState(@NonNull String targetPackageName) {













        return getAppFunctionAccessRequestState(mContext.getOpPackageName(), targetPackageName);













    public int getAccessRequestState(@NonNull String targetPackageName) {













        return getAccessRequestState(mContext.getOpPackageName(), targetPackageName);















    }































    /**















     * Get the access flags for a given agent and target. These flags include extra information















     * about the access state (whether it is pregranted, if the user has set state, etc.). Returns













     * 0 if the access is not {@link #getSelfAppFunctionAccessRequestState valid}.













     * 0 if the access is not {@link #getAccessRequestState(String) valid}.















     *















     * @param agentPackageName  The package name of the agent















     * @param targetPackageName The package name of the target









@@ -596,10 +596,10 @@ public final class AppFunctionManager {













    @RequiresPermission(MANAGE_APP_FUNCTION_ACCESS)















    @FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)















    @AppFunctionAccessFlags













    public int getAppFunctionAccessFlags(@NonNull String agentPackageName,













    public int getAccessFlags(@NonNull String agentPackageName,















            @NonNull String targetPackageName) {















        try {













            return mService.getAppFunctionAccessFlags(agentPackageName,













            return mService.getAccessFlags(agentPackageName,















                    mContext.getUserId(), targetPackageName, mContext.getUserId());















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();









@@ -608,7 +608,7 @@ public final class AppFunctionManager {





























    /**















     * Updates the access flags for the given agent and target. If the access is not













     * {@link #getSelfAppFunctionAccessRequestState valid}, this method is a no-op.













     * {@link #getAccessRequestState(String) valid}, this method is a no-op.















     *















     * @param agentPackageName  The package name of the agent















     * @param targetPackageName The package name of the target









@@ -623,11 +623,11 @@ public final class AppFunctionManager {













    @SystemApi















    @RequiresPermission(MANAGE_APP_FUNCTION_ACCESS)















    @FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)













    public void updateAppFunctionAccessFlags(@NonNull String agentPackageName,













    public void updateAccessFlags(@NonNull String agentPackageName,















            @NonNull String targetPackageName, @AppFunctionAccessFlags int flagMask,















            @AppFunctionAccessFlags int flags) {















        try {













            mService.updateAppFunctionAccessFlags(agentPackageName,













            mService.updateAccessFlags(agentPackageName,















                    mContext.getUserId(), targetPackageName, mContext.getUserId(),















                    flagMask, flags);















        } catch (RemoteException e) {









@@ -641,9 +641,9 @@ public final class AppFunctionManager {













     *                          to.















     */















    @FlaggedApi(Flags.FLAG_APP_FUNCTION_ACCESS_API_ENABLED)













    public void revokeSelfAppFunctionAccess(@NonNull String targetPackageName) {













    public void revokeSelfAccess(@NonNull String targetPackageName) {















        try {













            mService.revokeSelfAppFunctionAccess(targetPackageName);













            mService.revokeSelfAccess(targetPackageName);















        } catch (RemoteException e) {















            throw e.rethrowFromSystemServer();















        }









@@ -651,7 +651,7 @@ public final class AppFunctionManager {













































    /**













     * Gets all {@link #getSelfAppFunctionAccessRequestState valid} agents.













     * Gets all {@link #getAccessRequestState(String) valid} agents.















     * @return A list of all valid agent package names















     * @hide















     */









@@ -667,7 +667,7 @@ public final class AppFunctionManager {













    }































    /**













     * Gets all {@link #getSelfAppFunctionAccessRequestState valid} target apps.













     * Gets all {@link #getAccessRequestState(String) valid} target apps.















     * @return A list of all target app package names in the current user that the agent can















     * request access for















     * @hide

































core/java/android/app/appfunctions/IAppFunctionManager.aidl



+4
−4




























Original line number
Diff line number
Diff line








@@ -53,21 +53,21 @@ interface IAppFunctionManager {













        in IAppFunctionEnabledCallback callback















    );





























    int getAppFunctionAccessRequestState(













    int getAccessRequestState(















        in String agentPackageName,















        int agentUserId,















        in String targetPackageName,















        int targetUserId















    );





























    int getAppFunctionAccessFlags(













    int getAccessFlags(















        in String agentPackageName,















        int agentUserId,















        in String targetPackageName,















        int targetUserId















    );





























    boolean updateAppFunctionAccessFlags(













    boolean updateAccessFlags(















        in String agentPackageName,















        int agentUserId,















        in String targetPackageName,









@@ -76,7 +76,7 @@ interface IAppFunctionManager {













        int flags















    );





























    void revokeSelfAppFunctionAccess(in String targetPackageName);













    void revokeSelfAccess(in String targetPackageName);































    List<String> getValidAgents(















        int userId