Snap for 7152399 from 021885b03abe889a724412a45457ee4ae002e0d4 to sc-release (58c304ee) · Commits · e / os / android_frameworks_native

Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,3 +43,8 @@ filegroup {
		":framework_native_aidl_gui",
		],
		}

		cc_library_headers{
		name: "libandroid_headers_private",
		export_include_dirs: ["include/private"],
		}
		No newline at end of file

data/etc/android.hardware.keystore.app_attest_key.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2021 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.
		-->

		<!-- Feature for devices that support app attestation keys (i.e. KeyMint 1.0). -->
		<permissions>
		<feature name="android.hardware.keystore.app_attest_key" />
		</permissions>

include/android/permission_manager.h

+15 −2

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

		/**
		* Structures and functions related to permission checks in native code.
		*
		* @addtogroup Permission
		* @{
		*/

		/**
		* @file permission_manager.h
		*/

		#ifndef ANDROID_PERMISSION_MANAGER_H
		#define ANDROID_PERMISSION_MANAGER_H

		@@ -48,8 +59,8 @@ enum {
		enum {
		/**
		* This is returned if the permission check completed without errors.
		* The output result is valid and contains one of {PERMISSION_MANAGER_PERMISSION_GRANTED,
		* PERMISSION_MANAGER_PERMISSION_DENIED}.
		* The output result is valid and contains one of {::PERMISSION_MANAGER_PERMISSION_GRANTED,
		* ::PERMISSION_MANAGER_PERMISSION_DENIED}.
		*/
		PERMISSION_MANAGER_STATUS_OK = 0,
		/**
		@@ -85,3 +96,5 @@ int32_t APermissionManager_checkPermission(const char* permission,
		__END_DECLS

		#endif // ANDROID_PERMISSION_MANAGER_H

		/** @} */

include/private/surface_control_private.h

0 → 100644

+71 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 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.
		*/

		#ifndef ANDROID_PRIVATE_NATIVE_SURFACE_CONTROL_H
		#define ANDROID_PRIVATE_NATIVE_SURFACE_CONTROL_H

		#include <stdint.h>

		__BEGIN_DECLS

		struct ASurfaceControl;
		struct ASurfaceControlStats;

		typedef struct ASurfaceControlStats ASurfaceControlStats;

		/**
		* Callback to be notified when surface stats for a specific surface control are available.
		*/
		typedef void (ASurfaceControl_SurfaceStatsListener)(void context,
		ASurfaceControl* control, ASurfaceControlStats* stats);

		/**
		* Registers a callback to be invoked when surface stats from a specific surface are available.
		*
		* \param context Optional context provided by the client that is passed into
		* the callback.
		*
		* \param control The surface to retrieve callbacks for.
		*
		* \param func The callback to be invoked when surface stats are available.
		*/
		void ASurfaceControl_registerSurfaceStatsListener(ASurfaceControl* control, void* context,
		ASurfaceControl_SurfaceStatsListener func);

		/**
		* Unregisters a callback to be invoked when surface stats from a specific surface are available.
		*
		* \param context The context passed into ASurfaceControl_registerSurfaceStatsListener
		*
		* \param func The callback passed into ASurfaceControl_registerSurfaceStatsListener
		*/
		void ASurfaceControl_unregisterSurfaceStatsListener(void* context,
		ASurfaceControl_SurfaceStatsListener func);

		/**
		* Returns the timestamp of when the buffer was acquired for a specific frame with frame number
		* obtained from ASurfaceControlStats_getFrameNumber.
		*/
		int64_t ASurfaceControlStats_getAcquireTime(ASurfaceControlStats* stats);

		/**
		* Returns the frame number of the surface stats object passed into the callback.
		*/
		uint64_t ASurfaceControlStats_getFrameNumber(ASurfaceControlStats* stats);

		__END_DECLS

		#endif //ANDROID_PRIVATE_NATIVE_SURFACE_CONTROL_H

libs/binder/Parcel.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -520,7 +520,7 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const {
		}
		}

		#if defined(__ANDROID_VNDK__) && !defined(__ANDROID_APEX__)
		#if defined(__ANDROID_VNDK__)
		constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');
		#else
		constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');