Snap for 12247339 from 070303ac47336c87308b2915177ad86460af4a50 to 24Q4-release (aee9504c) · Commits · e / os / android_frameworks_base

cmds/screencap/screencap.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,9 @@
		* limitations under the License.
		*/

		#include <android/bitmap.h>
		#include <android/gui/DisplayCaptureArgs.h>
		#include <binder/ProcessState.h>
		#include <errno.h>
		#include <unistd.h>
		#include <stdio.h>
		@@ -33,7 +36,6 @@

		#include <ftl/concat.h>
		#include <ftl/optional.h>
		#include <gui/DisplayCaptureArgs.h>
		#include <gui/ISurfaceComposer.h>
		#include <gui/SurfaceComposerClient.h>
		#include <gui/SyncScreenCaptureListener.h>

core/api/current.txt

+25 −0

Original line number	Diff line number	Diff line
		@@ -8741,6 +8741,31 @@ package android.app.appfunctions {
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionRequest.Builder setParameters(@NonNull android.app.appsearch.GenericDocument);
		}

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public final class ExecuteAppFunctionResponse implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public String getErrorMessage();
		method @NonNull public android.os.Bundle getExtras();
		method public int getResultCode();
		method @NonNull public android.app.appsearch.GenericDocument getResultDocument();
		method public boolean isSuccess();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.appfunctions.ExecuteAppFunctionResponse> CREATOR;
		field public static final String PROPERTY_RETURN_VALUE = "returnValue";
		field public static final int RESULT_APP_UNKNOWN_ERROR = 2; // 0x2
		field public static final int RESULT_DENIED = 1; // 0x1
		field public static final int RESULT_INTERNAL_ERROR = 3; // 0x3
		field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4
		field public static final int RESULT_OK = 0; // 0x0
		field public static final int RESULT_TIMED_OUT = 5; // 0x5
		}

		@FlaggedApi("android.app.appfunctions.flags.enable_app_function_manager") public static final class ExecuteAppFunctionResponse.Builder {
		ctor public ExecuteAppFunctionResponse.Builder(@NonNull android.app.appsearch.GenericDocument);
		ctor public ExecuteAppFunctionResponse.Builder(int, @NonNull String);
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionResponse build();
		method @NonNull public android.app.appfunctions.ExecuteAppFunctionResponse.Builder setExtras(@NonNull android.os.Bundle);
		}

		}

		package android.app.assist {

core/api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -941,7 +941,7 @@ package android.companion.virtual {
		method public int getAudioRecordingSessionId(int);
		method public int getDeviceIdForDisplayId(int);
		method public int getDevicePolicy(int, int);
		method @FlaggedApi("android.companion.virtual.flags.interactive_screen_mirror") public boolean isVirtualDeviceOwnedMirrorDisplay(int);
		method public boolean isVirtualDeviceOwnedMirrorDisplay(int);
		method public void playSoundEffect(int, int);
		}

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

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app.appfunctions;

		import android.app.appfunctions.ExecuteAppFunctionResponse;

		parcelable ExecuteAppFunctionResponse;
		No newline at end of file

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

0 → 100644

+294 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.app.appfunctions;

		import static android.app.appfunctions.flags.Flags.FLAG_ENABLE_APP_FUNCTION_MANAGER;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.appsearch.GenericDocument;
		import android.os.Bundle;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Objects;

		/**
		* The response to an app function execution.
		*/
		@FlaggedApi(FLAG_ENABLE_APP_FUNCTION_MANAGER)
		public final class ExecuteAppFunctionResponse implements Parcelable {
		@NonNull
		public static final Creator<ExecuteAppFunctionResponse> CREATOR =
		new Creator<ExecuteAppFunctionResponse>() {
		@Override
		public ExecuteAppFunctionResponse createFromParcel(Parcel parcel) {
		GenericDocument result =
		Objects.requireNonNull(GenericDocument.createFromParcel(parcel));
		Bundle extras = Objects.requireNonNull(
		parcel.readBundle(Bundle.class.getClassLoader()));
		int resultCode = parcel.readInt();
		String errorMessage = parcel.readString8();
		return new ExecuteAppFunctionResponse(result, extras, resultCode, errorMessage);
		}

		@Override
		public ExecuteAppFunctionResponse[] newArray(int size) {
		return new ExecuteAppFunctionResponse[size];
		}
		};
		/**
		* The name of the property that stores the function return value within the
		* {@code resultDocument}.
		*
		* <p>See {@link GenericDocument#getProperty(String)} for more information.
		*
		* <p>If the function returns {@code void} or throws an error, the {@code resultDocument}
		* will be empty {@link GenericDocument}.
		*
		* <p>If the {@code resultDocument} is empty, {@link GenericDocument#getProperty(String)} will
		* return {@code null}.
		*
		* <p>See {@link #getResultDocument} for more information on extracting the return value.
		*/
		public static final String PROPERTY_RETURN_VALUE = "returnValue";

		/**
		* The call was successful.
		*/
		public static final int RESULT_OK = 0;

		/**
		* The caller does not have the permission to execute an app function.
		*/
		public static final int RESULT_DENIED = 1;

		/**
		* An unknown error occurred while processing the call in the AppFunctionService.
		*/
		public static final int RESULT_APP_UNKNOWN_ERROR = 2;

		/**
		* An internal error occurred within AppFunctionManagerService.
		*
		* <p>This error may be considered similar to {@link IllegalStateException}
		*/
		public static final int RESULT_INTERNAL_ERROR = 3;

		/**
		* The caller supplied invalid arguments to the call.
		*
		* <p>This error may be considered similar to {@link IllegalArgumentException}.
		*/
		public static final int RESULT_INVALID_ARGUMENT = 4;

		/**
		* The operation was timed out.
		*/
		public static final int RESULT_TIMED_OUT = 5;

		/**
		* The result code of the app function execution.
		*/
		@ResultCode
		private final int mResultCode;

		/**
		* The error message associated with the result, if any. This is {@code null} if the result code
		* is {@link #RESULT_OK}.
		*/
		@Nullable
		private final String mErrorMessage;

		/**
		* Returns the return value of the executed function.
		*
		* <p>The return value is stored in a {@link GenericDocument} with the key
		* {@link #PROPERTY_RETURN_VALUE}.
		*
		* <p>See {@link #getResultDocument} for more information on extracting the return value.
		*/
		@NonNull
		private final GenericDocument mResultDocument;

		/**
		* Returns the additional metadata data relevant to this function execution response.
		*/
		@NonNull
		private final Bundle mExtras;

		private ExecuteAppFunctionResponse(@NonNull GenericDocument resultDocument,
		@NonNull Bundle extras,
		@ResultCode int resultCode,
		@Nullable String errorMessage) {
		mResultDocument = Objects.requireNonNull(resultDocument);
		mExtras = Objects.requireNonNull(extras);
		mResultCode = resultCode;
		mErrorMessage = errorMessage;
		}

		/**
		* Returns a generic document containing the return value of the executed function.
		*
		* <p>The {@link #PROPERTY_RETURN_VALUE} key can be used to obtain the return value.</p>
		*
		* <p>An empty document is returned if {@link #isSuccess} is {@code false} or if the executed
		* function does not produce a return value.
		*
		* <p>Sample code for extracting the return value:
		* <pre>
		* GenericDocument resultDocument = response.getResultDocument();
		* Object returnValue = resultDocument.getProperty(PROPERTY_RETURN_VALUE);
		* if (returnValue != null) {
		* // Cast returnValue to expected type, or use {@link GenericDocument#getPropertyString},
		* // {@link GenericDocument#getPropertyLong} etc.
		* // Do something with the returnValue
		* }
		* </pre>
		*/
		@NonNull
		public GenericDocument getResultDocument() {
		return mResultDocument;
		}

		/**
		* Returns the extras of the app function execution.
		*/
		@NonNull
		public Bundle getExtras() {
		return mExtras;
		}

		/**
		* Returns {@code true} if {@link #getResultCode} equals
		* {@link ExecuteAppFunctionResponse#RESULT_OK}.
		*/
		public boolean isSuccess() {
		return getResultCode() == RESULT_OK;
		}

		/**
		* Returns one of the {@code RESULT} constants defined in {@link ExecuteAppFunctionResponse}.
		*/
		@ResultCode
		public int getResultCode() {
		return mResultCode;
		}

		/**
		* Returns the error message associated with this result.
		*
		* <p>If {@link #isSuccess} is {@code true}, the error message is always {@code null}.
		*/
		@Nullable
		public String getErrorMessage() {
		return mErrorMessage;
		}

		@Override
		public int describeContents() {
		return 0;
		}

		@Override
		public void writeToParcel(@NonNull Parcel dest, int flags) {
		mResultDocument.writeToParcel(dest, flags);
		dest.writeBundle(mExtras);
		dest.writeInt(mResultCode);
		dest.writeString8(mErrorMessage);
		}

		/**
		* Result codes.
		*
		* @hide
		*/
		@IntDef(
		prefix = {"RESULT_"},
		value = {
		RESULT_OK,
		RESULT_DENIED,
		RESULT_APP_UNKNOWN_ERROR,
		RESULT_INTERNAL_ERROR,
		RESULT_INVALID_ARGUMENT,
		RESULT_TIMED_OUT,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface ResultCode {
		}

		/**
		* The builder for creating {@link ExecuteAppFunctionResponse} instances.
		*/
		@FlaggedApi(FLAG_ENABLE_APP_FUNCTION_MANAGER)
		public static final class Builder {
		@NonNull
		private GenericDocument mResultDocument = new GenericDocument.Builder<>("", "", "").build();
		@NonNull
		private Bundle mExtras = Bundle.EMPTY;
		private int mResultCode;
		@Nullable
		private String mErrorMessage;

		/**
		* Creates a new builder for {@link ExecuteAppFunctionResponse}.
		*/
		private Builder() {
		}

		/**
		* Creates a new builder for {@link ExecuteAppFunctionResponse} to build a success response
		* with a result code of {@link #RESULT_OK} and a resultDocument.
		*/
		public Builder(@NonNull GenericDocument resultDocument) {
		mResultDocument = Objects.requireNonNull(resultDocument);
		mResultCode = RESULT_OK;
		}

		/**
		* Creates a new builder for {@link ExecuteAppFunctionResponse} to build an error response
		* with a result code and an error message.
		*/
		public Builder(@ResultCode int resultCode,
		@NonNull String errorMessage) {
		mResultCode = resultCode;
		mErrorMessage = Objects.requireNonNull(errorMessage);
		}

		/**
		* Sets the extras of the app function execution.
		*/
		@NonNull
		public Builder setExtras(@NonNull Bundle extras) {
		mExtras = Objects.requireNonNull(extras);
		return this;
		}

		/**
		* Builds the {@link ExecuteAppFunctionResponse} instance.
		*/
		@NonNull
		public ExecuteAppFunctionResponse build() {
		return new ExecuteAppFunctionResponse(
		mResultDocument, mExtras, mResultCode, mErrorMessage);
		}
		}
		}