Merge "Add a dedicated error code for missing function ID" into main (d2e98330) · Commits · e / os / android_frameworks_base

core/api/current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -8837,9 +8837,10 @@ package android.app.appfunctions {
		field public static final int RESULT_CANCELLED = 2001; // 0x7d1
		field public static final int RESULT_DENIED = 1000; // 0x3e8
		field public static final int RESULT_DISABLED = 1002; // 0x3ea
		field public static final int RESULT_INTERNAL_ERROR = 2000; // 0x7d0
		field public static final int RESULT_FUNCTION_NOT_FOUND = 1003; // 0x3eb
		field public static final int RESULT_INVALID_ARGUMENT = 1001; // 0x3e9
		field public static final int RESULT_OK = 0; // 0x0
		field public static final int RESULT_SYSTEM_ERROR = 2000; // 0x7d0
		}

		}

+10 −4

Original line number	Diff line number	Diff line
		@@ -99,18 +99,23 @@ public final class ExecuteAppFunctionResponse implements Parcelable {
		/**
		* The caller tried to execute a disabled app function.
		*
		* <p>This error is in the request error category.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_REQUEST_ERROR} category.
		*/
		public static final int RESULT_DISABLED = 1002;

		/**
		* The caller tried to execute a function that does not exist.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_REQUEST_ERROR} category.
		*/
		public static final int RESULT_FUNCTION_NOT_FOUND = 1003;

		/**
		* An internal unexpected error coming from the system.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_SYSTEM} category.
		*/
		public static final int RESULT_INTERNAL_ERROR = 2000;
		public static final int RESULT_SYSTEM_ERROR = 2000;

		/**
		* The operation was cancelled. Use this error code to report that a cancellation is done after
		@@ -369,7 +374,8 @@ public final class ExecuteAppFunctionResponse implements Parcelable {
		RESULT_OK,
		RESULT_DENIED,
		RESULT_APP_UNKNOWN_ERROR,
		RESULT_INTERNAL_ERROR,
		RESULT_FUNCTION_NOT_FOUND,
		RESULT_SYSTEM_ERROR,
		RESULT_INVALID_ARGUMENT,
		RESULT_DISABLED,
		RESULT_CANCELLED

+2 −1

Original line number	Diff line number	Diff line
		@@ -52,9 +52,10 @@ package com.google.android.appfunctions.sidecar {
		field public static final int RESULT_CANCELLED = 2001; // 0x7d1
		field public static final int RESULT_DENIED = 1000; // 0x3e8
		field public static final int RESULT_DISABLED = 1002; // 0x3ea
		field public static final int RESULT_INTERNAL_ERROR = 2000; // 0x7d0
		field public static final int RESULT_FUNCTION_NOT_FOUND = 1003; // 0x3eb
		field public static final int RESULT_INVALID_ARGUMENT = 1001; // 0x3e9
		field public static final int RESULT_OK = 0; // 0x0
		field public static final int RESULT_SYSTEM_ERROR = 2000; // 0x7d0
		}

		}

+10 −4

Original line number	Diff line number	Diff line
		@@ -76,18 +76,23 @@ public final class ExecuteAppFunctionResponse {
		/**
		* The caller tried to execute a disabled app function.
		*
		* <p>This error is in the request error category.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_REQUEST_ERROR} category.
		*/
		public static final int RESULT_DISABLED = 1002;

		/**
		* The caller tried to execute a function that does not exist.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_REQUEST_ERROR} category.
		*/
		public static final int RESULT_FUNCTION_NOT_FOUND = 1003;

		/**
		* An internal unexpected error coming from the system.
		*
		* <p>This error is in the {@link #ERROR_CATEGORY_SYSTEM} category.
		*/
		public static final int RESULT_INTERNAL_ERROR = 2000;
		public static final int RESULT_SYSTEM_ERROR = 2000;

		/**
		* The operation was cancelled. Use this error code to report that a cancellation is done after
		@@ -327,7 +332,8 @@ public final class ExecuteAppFunctionResponse {
		RESULT_OK,
		RESULT_DENIED,
		RESULT_APP_UNKNOWN_ERROR,
		RESULT_INTERNAL_ERROR,
		RESULT_SYSTEM_ERROR,
		RESULT_FUNCTION_NOT_FOUND,
		RESULT_INVALID_ARGUMENT,
		RESULT_DISABLED,
		RESULT_CANCELLED

+4 −4

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ class SidecarConverterTest {
		val emptyGd = GenericDocument.Builder<GenericDocument.Builder<*>>("", "", "").build()
		val platformResponse =
		ExecuteAppFunctionResponse.newFailure(
		ExecuteAppFunctionResponse.RESULT_INTERNAL_ERROR,
		ExecuteAppFunctionResponse.RESULT_SYSTEM_ERROR,
		null,
		null
		)
		@@ -119,7 +119,7 @@ class SidecarConverterTest {
		assertThat(sidecarResponse.resultDocument.id).isEqualTo(emptyGd.id)
		assertThat(sidecarResponse.resultDocument.schemaType).isEqualTo(emptyGd.schemaType)
		assertThat(sidecarResponse.resultCode)
		.isEqualTo(ExecuteAppFunctionResponse.RESULT_INTERNAL_ERROR)
		.isEqualTo(ExecuteAppFunctionResponse.RESULT_SYSTEM_ERROR)
		assertThat(sidecarResponse.errorMessage).isNull()
		}

		@@ -152,7 +152,7 @@ class SidecarConverterTest {
		val emptyGd = GenericDocument.Builder<GenericDocument.Builder<*>>("", "", "").build()
		val sidecarResponse =
		com.google.android.appfunctions.sidecar.ExecuteAppFunctionResponse.newFailure(
		ExecuteAppFunctionResponse.RESULT_INTERNAL_ERROR,
		ExecuteAppFunctionResponse.RESULT_SYSTEM_ERROR,
		null,
		null
		)
		@@ -166,7 +166,7 @@ class SidecarConverterTest {
		assertThat(platformResponse.resultDocument.id).isEqualTo(emptyGd.id)
		assertThat(platformResponse.resultDocument.schemaType).isEqualTo(emptyGd.schemaType)
		assertThat(platformResponse.resultCode)
		.isEqualTo(ExecuteAppFunctionResponse.RESULT_INTERNAL_ERROR)
		.isEqualTo(ExecuteAppFunctionResponse.RESULT_SYSTEM_ERROR)
		assertThat(platformResponse.errorMessage).isNull()
		}
		}