Split the isAppFunctionEnabled method into two overloads (67167c3b) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -8783,7 +8783,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.permission.EXECUTE_APP_FUNCTIONS"}, conditional=true) public void executeAppFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		method public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
		method @RequiresPermission(anyOf={"android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED", "android.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
		field public static final int APP_FUNCTION_STATE_DISABLED = 2; // 0x2

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

+65 −22

Original line number	Diff line number	Diff line
		@@ -53,8 +53,8 @@ import java.util.function.Consumer;
		* offers a more convenient and type-safe way to build app functions. The SDK provides predefined
		* function schemas for common use cases and associated data classes for function parameters and
		* return values. Apps only have to implement the provided interfaces. Internally, the SDK converts
		* these data classes into {@link ExecuteAppFunctionRequest#getParameters()} and
		* {@link ExecuteAppFunctionResponse#getResultDocument()}.
		* these data classes into {@link ExecuteAppFunctionRequest#getParameters()} and {@link
		* ExecuteAppFunctionResponse#getResultDocument()}.
		*
		* <p>Discovering App Functions:
		*
		@@ -69,13 +69,12 @@ import java.util.function.Consumer;
		* <p>Executing App Functions:
		*
		* <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 {@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.
		*
		* <p>Example:
		*
		@@ -213,12 +212,13 @@ 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
		* <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.
		*
		* <p>If operation fails, the callback's {@link OutcomeReceiver#onError} is called with errors:
		* <p>If the operation fails, the callback's {@link OutcomeReceiver#onError} is called with
		* errors:
		*
		* <ul>
		* <li>{@link IllegalArgumentException}, if the function is not found or the caller does not
		@@ -232,23 +232,47 @@ 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)
		public void isAppFunctionEnabled(
		@NonNull String functionIdentifier,
		@NonNull String targetPackage,
		@NonNull Executor executor,
		@NonNull OutcomeReceiver<Boolean, Exception> callback) {
		Objects.requireNonNull(functionIdentifier);
		Objects.requireNonNull(targetPackage);
		Objects.requireNonNull(executor);
		Objects.requireNonNull(callback);
		AppSearchManager appSearchManager = mContext.getSystemService(AppSearchManager.class);
		if (appSearchManager == null) {
		callback.onError(new IllegalStateException("Failed to get AppSearchManager."));
		return;
		isAppFunctionEnabledInternal(functionIdentifier, targetPackage, executor, callback);
		}

		AppFunctionManagerHelper.isAppFunctionEnabled(
		functionIdentifier, targetPackage, appSearchManager, executor, callback);
		/**
		* 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, unlike {@link
		* #isAppFunctionEnabled(String, String, Executor, OutcomeReceiver)}, which allows specifying a
		* different target package.
		*
		* <p>If the operation fails, the callback's {@link OutcomeReceiver#onError} is called with
		* errors:
		*
		* <ul>
		* <li>{@link IllegalArgumentException}, if the function is not found or the caller does not
		* have access to it.
		* </ul>
		*
		* @param functionIdentifier the identifier of the app function to check (unique within the
		* target package) and in most cases, these are automatically generated by the AppFunctions
		* SDK
		* @param executor the executor to run the request
		* @param callback the callback to receive the function enabled check result
		*/
		public void isAppFunctionEnabled(
		@NonNull String functionIdentifier,
		@NonNull Executor executor,
		@NonNull OutcomeReceiver<Boolean, Exception> callback) {
		isAppFunctionEnabledInternal(
		functionIdentifier, mContext.getPackageName(), executor, callback);
		}

		/**
		@@ -291,6 +315,25 @@ public final class AppFunctionManager {
		}
		}

		private void isAppFunctionEnabledInternal(
		@NonNull String functionIdentifier,
		@NonNull String targetPackage,
		@NonNull Executor executor,
		@NonNull OutcomeReceiver<Boolean, Exception> callback) {
		Objects.requireNonNull(functionIdentifier);
		Objects.requireNonNull(targetPackage);
		Objects.requireNonNull(executor);
		Objects.requireNonNull(callback);
		AppSearchManager appSearchManager = mContext.getSystemService(AppSearchManager.class);
		if (appSearchManager == null) {
		callback.onError(new IllegalStateException("Failed to get AppSearchManager."));
		return;
		}

		AppFunctionManagerHelper.isAppFunctionEnabled(
		functionIdentifier, targetPackage, appSearchManager, executor, callback);
		}

		private static class CallbackWrapper extends IAppFunctionEnabledCallback.Stub {

		private final OutcomeReceiver<Void, Exception> mCallback;

libs/appfunctions/api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -3,8 +3,9 @@ package com.google.android.appfunctions.sidecar {

		public final class AppFunctionManager {
		ctor public AppFunctionManager(android.content.Context);
		method public void executeAppFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		method public void isAppFunctionEnabled(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>);
		method @RequiresPermission(anyOf={android.Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED, android.Manifest.permission.EXECUTE_APP_FUNCTIONS}, conditional=true) public void executeAppFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		method @RequiresPermission(anyOf={android.Manifest.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 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
		field public static final int APP_FUNCTION_STATE_DISABLED = 2; // 0x2

libs/appfunctions/java/com/google/android/appfunctions/sidecar/AppFunctionManager.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -16,9 +16,11 @@

		package com.google.android.appfunctions.sidecar;

		import android.Manifest;
		import android.annotation.CallbackExecutor;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		import android.annotation.SuppressLint;
		import android.annotation.UserHandleAware;
		import android.content.Context;
		@@ -103,6 +105,12 @@ public final class AppFunctionManager {
		* <p>See {@link android.app.appfunctions.AppFunctionManager#executeAppFunction} for the
		* documented behaviour of this method.
		*/
		@RequiresPermission(
		anyOf = {
		Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED,
		Manifest.permission.EXECUTE_APP_FUNCTIONS
		},
		conditional = true)
		public void executeAppFunction(
		@NonNull ExecuteAppFunctionRequest sidecarRequest,
		@NonNull @CallbackExecutor Executor executor,
		@@ -131,6 +139,12 @@ public final class AppFunctionManager {
		* <p>See {@link android.app.appfunctions.AppFunctionManager#isAppFunctionEnabled} for the
		* documented behaviour of this method.
		*/
		@RequiresPermission(
		anyOf = {
		Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED,
		Manifest.permission.EXECUTE_APP_FUNCTIONS
		},
		conditional = true)
		public void isAppFunctionEnabled(
		@NonNull String functionIdentifier,
		@NonNull String targetPackage,
		@@ -139,6 +153,19 @@ public final class AppFunctionManager {
		mManager.isAppFunctionEnabled(functionIdentifier, targetPackage, executor, callback);
		}

		/**
		* Returns a boolean through a callback, indicating whether the app function is enabled.
		*
		* <p>See {@link android.app.appfunctions.AppFunctionManager#isAppFunctionEnabled} for the
		* documented behaviour of this method.
		*/
		public void isAppFunctionEnabled(
		@NonNull String functionIdentifier,
		@NonNull Executor executor,
		@NonNull OutcomeReceiver<Boolean, Exception> callback) {
		mManager.isAppFunctionEnabled(functionIdentifier, executor, callback);
		}

		/**
		* Sets the enabled state of the app function owned by the calling package.
		*