API Council feedback

Flag: android.app.appfunctions.flags.enable_app_function_manager
Test: CTS
Bug: 376890974
Change-Id: Idc835c2af581a0f60a2c64d2ffafbbb1a353356a

6 files changed, 8 insertions, 8 deletions

diff --git a/core/api/current.txt b/core/api/current.txt
index ead655426bf9..42d4c145343c 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -8837,7 +8837,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
diff --git a/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java b/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java
index 41bb62270e9f..1557815a8468 100644
--- a/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java
+++ b/core/java/android/app/appfunctions/ExecuteAppFunctionRequest.java
@@ -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.
      */
diff --git a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java
index cdf02e6f5a09..ced4b553d641 100644
--- a/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java
+++ b/core/java/android/app/appfunctions/ExecuteAppFunctionResponse.java
@@ -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.
diff --git a/libs/appfunctions/api/current.txt b/libs/appfunctions/api/current.txt
index faf84a8ab5ac..0f384e948575 100644
--- a/libs/appfunctions/api/current.txt
+++ b/libs/appfunctions/api/current.txt
@@ -47,7 +47,7 @@ package com.google.android.appfunctions.sidecar {
     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
diff --git a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionRequest.java b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionRequest.java
index 593c5213dd52..9cf4c6a9b3c5 100644
--- a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionRequest.java
+++ b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionRequest.java
@@ -91,8 +91,8 @@ public final class ExecuteAppFunctionRequest {
      * 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.
      *
      * <p>Similar to {@link #getFunctionIdentifier()} the parameters required by a function can be
      * obtained by querying AppSearch for the corresponding {@code AppFunctionStaticMetadata}. This
diff --git a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java
index 4e88fb025a9d..c806a0780551 100644
--- a/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java
+++ b/libs/appfunctions/java/com/google/android/appfunctions/sidecar/ExecuteAppFunctionResponse.java
@@ -48,7 +48,7 @@ public final class ExecuteAppFunctionResponse {
      *
      * <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.