Merge changes from topic "ext-AF" into main (712aacf4) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8840,7 +8840,7 @@ package android.app.appfunctions {
		field public static final int ERROR_CATEGORY_REQUEST_ERROR = 1; // 0x1
		field public static final int ERROR_CATEGORY_SYSTEM = 2; // 0x2
		field public static final int ERROR_CATEGORY_UNKNOWN = 0; // 0x0
		field public static final String PROPERTY_RETURN_VALUE = "returnValue";
		field public static final String PROPERTY_RETURN_VALUE = "android_app_appfunctions_returnvalue";
		field public static final int RESULT_APP_UNKNOWN_ERROR = 3000; // 0xbb8
		field public static final int RESULT_CANCELLED = 2001; // 0x7d1
		field public static final int RESULT_DENIED = 1000; // 0x3e8

core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -111,8 +111,8 @@ public final class ExecuteAppFunctionRequest implements Parcelable {
		* Returns the function parameters. The key is the parameter name, and the value is the
		* parameter value.
		*
		* <p>The bundle may have missing parameters. Developers are advised to implement defensive
		* handling measures.
		* <p>The {@link GenericDocument} may have missing parameters. Developers are advised to
		* implement defensive handling measures.
		*
		* @see AppFunctionManager on how to determine the expected parameters.
		*/

core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public final class ExecuteAppFunctionResponse implements Parcelable {
		*
		* <p>See {@link #getResultDocument} for more information on extracting the return value.
		*/
		public static final String PROPERTY_RETURN_VALUE = "returnValue";
		public static final String PROPERTY_RETURN_VALUE = "android_app_appfunctions_returnvalue";

		/**
		* The call was successful.

libs/appfunctions/Android.bp

+4 −4

Original line number	Diff line number	Diff line
		@@ -18,10 +18,10 @@ package {
		}

		java_sdk_library {
		name: "com.google.android.appfunctions.sidecar",
		name: "com.android.extensions.appfunctions",
		owner: "google",
		srcs: ["java/*/.java"],
		api_packages: ["com.google.android.appfunctions.sidecar"],
		api_packages: ["com.android.extensions.appfunctions"],
		dex_preopt: {
		enabled: false,
		},
		@@ -31,9 +31,9 @@ java_sdk_library {
		}

		prebuilt_etc {
		name: "appfunctions.sidecar.xml",
		name: "appfunctions.extension.xml",
		system_ext_specific: true,
		sub_dir: "permissions",
		src: "appfunctions.sidecar.xml",
		src: "appfunctions.extension.xml",
		filename_from_src: true,
		}

libs/appfunctions/api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		// Signature format: 2.0
		package com.google.android.appfunctions.sidecar {
		package com.android.extensions.appfunctions {

		public final class AppFunctionManager {
		ctor public AppFunctionManager(android.content.Context);
		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 executeAppFunction(@NonNull com.android.extensions.appfunctions.ExecuteAppFunctionRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.android.extensions.appfunctions.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>);
		@@ -15,7 +15,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 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>);
		method @MainThread public abstract void onExecuteFunction(@NonNull com.android.extensions.appfunctions.ExecuteAppFunctionRequest, @NonNull String, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<com.android.extensions.appfunctions.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";
		}
		@@ -29,9 +29,9 @@ package com.google.android.appfunctions.sidecar {

		public static final class ExecuteAppFunctionRequest.Builder {
		ctor public ExecuteAppFunctionRequest.Builder(@NonNull String, @NonNull String);
		method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest build();
		method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public com.google.android.appfunctions.sidecar.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);
		method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest build();
		method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest.Builder setExtras(@NonNull android.os.Bundle);
		method @NonNull public com.android.extensions.appfunctions.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);
		}

		public final class ExecuteAppFunctionResponse {
		@@ -41,13 +41,13 @@ package com.google.android.appfunctions.sidecar {
		method public int getResultCode();
		method @NonNull public android.app.appsearch.GenericDocument getResultDocument();
		method public boolean isSuccess();
		method @NonNull public static com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse newFailure(int, @Nullable String, @Nullable android.os.Bundle);
		method @NonNull public static com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse newSuccess(@NonNull android.app.appsearch.GenericDocument, @Nullable android.os.Bundle);
		method @NonNull public static com.android.extensions.appfunctions.ExecuteAppFunctionResponse newFailure(int, @Nullable String, @Nullable android.os.Bundle);
		method @NonNull public static com.android.extensions.appfunctions.ExecuteAppFunctionResponse newSuccess(@NonNull android.app.appsearch.GenericDocument, @Nullable android.os.Bundle);
		field public static final int ERROR_CATEGORY_APP = 3; // 0x3
		field public static final int ERROR_CATEGORY_REQUEST_ERROR = 1; // 0x1
		field public static final int ERROR_CATEGORY_SYSTEM = 2; // 0x2
		field public static final int ERROR_CATEGORY_UNKNOWN = 0; // 0x0
		field public static final String PROPERTY_RETURN_VALUE = "returnValue";
		field public static final String PROPERTY_RETURN_VALUE = "android_app_appfunctions_returnvalue";
		field public static final int RESULT_APP_UNKNOWN_ERROR = 3000; // 0xbb8
		field public static final int RESULT_CANCELLED = 2001; // 0x7d1
		field public static final int RESULT_DENIED = 1000; // 0x3e8