Merge "Remove deprecated methods from AppFunctionManager and AppFunctionService." into main (cd102680) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −4

Original line number	Diff line number	Diff line
		@@ -8781,7 +8781,6 @@ package android.app.admin {
		package android.app.appfunctions {

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class AppFunctionManager {
		method @Deprecated @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 java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		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 public void setAppFunctionEnabled(@NonNull String, int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,java.lang.Exception>);
		@@ -8793,9 +8792,7 @@ package android.app.appfunctions {
		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public abstract class AppFunctionService extends android.app.Service {
		ctor public AppFunctionService();
		method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method @Deprecated @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		method @Deprecated @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		method @MainThread public void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		method @MainThread public abstract void onExecuteFunction(@NonNull android.app.appfunctions.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.app.appfunctions.ExecuteAppFunctionResponse>);
		field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService";
		}

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

+0 −34

Original line number	Diff line number	Diff line
		@@ -100,40 +100,6 @@ public final class AppFunctionManager {
		mContext = context;
		}

		/**
		* 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}.
		*
		* @param request the request to execute the app function
		* @param executor the executor to run the callback
		* @param callback the callback to receive the function execution result. 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
		* ExecuteAppFunctionResponse.RESULT_DENIED}.
		* @deprecated Use {@link #executeAppFunction(ExecuteAppFunctionRequest, Executor,
		* CancellationSignal, Consumer)} instead. This method will be removed once usage references
		* are updated.
		*/
		@RequiresPermission(
		anyOf = {
		Manifest.permission.EXECUTE_APP_FUNCTIONS_TRUSTED,
		Manifest.permission.EXECUTE_APP_FUNCTIONS
		},
		conditional = true)
		@UserHandleAware
		@Deprecated
		public void executeAppFunction(
		@NonNull ExecuteAppFunctionRequest request,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull Consumer<ExecuteAppFunctionResponse> callback) {
		executeAppFunction(request, executor, new CancellationSignal(), callback);
		}

		/**
		* Executes the app function.
		*

core/java/android/app/appfunctions/AppFunctionService.java

+2 −72

Original line number	Diff line number	Diff line
		@@ -141,74 +141,6 @@ public abstract class AppFunctionService extends Service {
		return mBinder;
		}

		/**
		* Called by the system to execute a specific app function.
		*
		* <p>This method is triggered when the system requests your AppFunctionService to handle a
		* particular function you have registered and made available.
		*
		* <p>To ensure proper routing of function requests, assign a unique identifier to each
		* function. This identifier doesn't need to be globally unique, but it must be unique within
		* your app. For example, a function to order food could be identified as "orderFood". In most
		* cases this identifier should come from the ID automatically generated by the AppFunctions
		* SDK. You can determine the specific function to invoke by calling {@link
		* ExecuteAppFunctionRequest#getFunctionIdentifier()}.
		*
		* <p>This method is always triggered in the main thread. You should run heavy tasks on a worker
		* thread and dispatch the result with the given callback. You should always report back the
		* result using the callback, no matter if the execution was successful or not.
		*
		* @param request The function execution request.
		* @param callback A callback to report back the result.
		* @deprecated Use {@link #onExecuteFunction(ExecuteAppFunctionRequest, CancellationSignal,
		* Consumer)} instead. This method will be removed once usage references are updated.
		*/
		@MainThread
		@Deprecated
		public void onExecuteFunction(
		@NonNull ExecuteAppFunctionRequest request,
		@NonNull Consumer<ExecuteAppFunctionResponse> callback) {
		Log.w(
		"AppFunctionService",
		"Calling deprecated default implementation of onExecuteFunction");
		}

		/**
		* Called by the system to execute a specific app function.
		*
		* <p>This method is triggered when the system requests your AppFunctionService to handle a
		* particular function you have registered and made available.
		*
		* <p>To ensure proper routing of function requests, assign a unique identifier to each
		* function. This identifier doesn't need to be globally unique, but it must be unique within
		* your app. For example, a function to order food could be identified as "orderFood". In most
		* cases this identifier should come from the ID automatically generated by the AppFunctions
		* SDK. You can determine the specific function to invoke by calling {@link
		* ExecuteAppFunctionRequest#getFunctionIdentifier()}.
		*
		* <p>This method is always triggered in the main thread. You should run heavy tasks on a worker
		* thread and dispatch the result with the given callback. You should always report back the
		* result using the callback, no matter if the execution was successful or not.
		*
		* <p>This method also accepts a {@link CancellationSignal} that the app should listen to cancel
		* the execution of function if requested by the system.
		*
		* @param request The function execution request.
		* @param cancellationSignal A signal to cancel the execution.
		* @param callback A callback to report back the result.
		* @deprecated Use {@link #onExecuteFunction(ExecuteAppFunctionRequest, String,
		* CancellationSignal, Consumer)} instead. This method will be removed once usage references
		* are updated.
		*/
		@MainThread
		@Deprecated
		public void onExecuteFunction(
		@NonNull ExecuteAppFunctionRequest request,
		@NonNull CancellationSignal cancellationSignal,
		@NonNull Consumer<ExecuteAppFunctionResponse> callback) {
		onExecuteFunction(request, callback);
		}

		/**
		* Called by the system to execute a specific app function.
		*
		@@ -235,11 +167,9 @@ public abstract class AppFunctionService extends Service {
		* @param callback A callback to report back the result.
		*/
		@MainThread
		public void onExecuteFunction(
		public abstract void onExecuteFunction(
		@NonNull ExecuteAppFunctionRequest request,
		@NonNull String callingPackage,
		@NonNull CancellationSignal cancellationSignal,
		@NonNull Consumer<ExecuteAppFunctionResponse> callback) {
		onExecuteFunction(request, cancellationSignal, callback);
		}
		@NonNull Consumer<ExecuteAppFunctionResponse> callback);
		}

libs/appfunctions/api/current.txt

+1 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ 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 @Deprecated public void executeAppFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @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 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
		@@ -15,9 +14,7 @@ package com.google.android.appfunctions.sidecar {
		public abstract class AppFunctionService extends android.app.Service {
		ctor public AppFunctionService();
		method @NonNull public final android.os.IBinder onBind(@Nullable android.content.Intent);
		method @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		method @Deprecated @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		method @Deprecated @MainThread public void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		method @MainThread public abstract void onExecuteFunction(@NonNull com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse>);
		field @NonNull public static final String BIND_APP_FUNCTION_SERVICE = "android.permission.BIND_APP_FUNCTION_SERVICE";
		field @NonNull public static final String SERVICE_INTERFACE = "android.app.appfunctions.AppFunctionService";
		}

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

+0 −27

Original line number	Diff line number	Diff line
		@@ -125,33 +125,6 @@ public final class AppFunctionManager {
		});
		}

		/**
		* Executes the app function.
		*
		* <p>Proxies request and response to the underlying {@link
		* android.app.appfunctions.AppFunctionManager#executeAppFunction}, converting the request and
		* response in the appropriate type required by the function.
		*
		* @deprecated Use {@link #executeAppFunction(ExecuteAppFunctionRequest, Executor,
		* CancellationSignal, Consumer)} instead. This method will be removed once usage references
		* are updated.
		*/
		@Deprecated
		public void executeAppFunction(
		@NonNull ExecuteAppFunctionRequest sidecarRequest,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull Consumer<ExecuteAppFunctionResponse> callback) {
		Objects.requireNonNull(sidecarRequest);
		Objects.requireNonNull(executor);
		Objects.requireNonNull(callback);

		executeAppFunction(
		sidecarRequest,
		executor,
		new CancellationSignal(),
		callback);
		}

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