Snap for 11802601 from 4994e61d4378f7bba1e60a680aae872a6b651ce1 to 24Q3-release (f0065c88) · Commits · e / os / android_frameworks_native

include/android/choreographer.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ AChoreographer* AChoreographer_getInstance() __INTRODUCED_IN(24);
		*/
		void AChoreographer_postFrameCallback(AChoreographer* choreographer,
		AChoreographer_frameCallback callback, void* data)
		__INTRODUCED_IN(24) __DEPRECATED_IN(29);
		__INTRODUCED_IN(24) __DEPRECATED_IN(29, "Use AChoreographer_postFrameCallback64 instead");

		/**
		* Deprecated: Use AChoreographer_postFrameCallbackDelayed64 instead.
		@@ -141,7 +141,7 @@ void AChoreographer_postFrameCallback(AChoreographer* choreographer,
		void AChoreographer_postFrameCallbackDelayed(AChoreographer* choreographer,
		AChoreographer_frameCallback callback, void* data,
		long delayMillis) __INTRODUCED_IN(24)
		__DEPRECATED_IN(29);
		__DEPRECATED_IN(29, "Use AChoreographer_postFrameCallbackDelayed64 instead");

		/**
		* Post a callback to be run on the next frame. The data pointer provided will

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ extern "C" {
		// This file may also be built on glibc or on Windows/MacOS libc's, so
		// deprecated definitions are provided.
		#if !defined(__REMOVED_IN)
		#define __REMOVED_IN(__api_level) __attribute__((__deprecated__))
		#define __REMOVED_IN(__api_level, msg) __attribute__((__deprecated__(msg)))
		#endif

		struct ALooper;
		@@ -213,7 +213,8 @@ int ALooper_pollOnce(int timeoutMillis, int* outFd, int* outEvents, void** outDa
		* Removed in API 34 as ALooper_pollAll can swallow ALooper_wake calls.
		* Use ALooper_pollOnce instead.
		*/
		int ALooper_pollAll(int timeoutMillis, int* outFd, int* outEvents, void** outData) __REMOVED_IN(1);
		int ALooper_pollAll(int timeoutMillis, int* outFd, int* outEvents, void** outData)
		__REMOVED_IN(1, "ALooper_pollAll may ignore wakes. Use ALooper_pollOnce instead. See https://github.com/android/ndk/discussions/2020 for more information");

		/**
		* Wakes the poll asynchronously.

+3 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@
		#define __INTRODUCED_IN(__api_level) /* nothing */
		#endif
		#if !defined(__DEPRECATED_IN)
		#define __DEPRECATED_IN(__api_level) __attribute__((__deprecated__))
		#define __DEPRECATED_IN(__api_level, msg) __attribute__((__deprecated__(msg)))
		#endif

		#ifdef __cplusplus
		@@ -748,7 +748,8 @@ typedef ASensorRef const* ASensorList;
		* ASensorManager* sensorManager = ASensorManager_getInstance();
		*
		*/
		ASensorManager* ASensorManager_getInstance() __DEPRECATED_IN(26);
		ASensorManager* ASensorManager_getInstance()
		__DEPRECATED_IN(26, "Use ASensorManager_getInstanceForPackage instead");

		/**
		* Get a reference to the sensor manager. ASensorManager is a singleton

+1 −4

Original line number	Diff line number	Diff line
		@@ -18,11 +18,8 @@

		#include <android/binder_ibinder.h>
		#include <android/binder_status.h>
		#include <sys/cdefs.h>

		#ifndef __TRUSTY__
		#include <android/llndk-versioning.h>
		#endif
		#include <sys/cdefs.h>

		__BEGIN_DECLS

0 → 100644

+18 −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.
		*/
		#pragma once

		#define __INTRODUCED_IN_LLNDK(x) /* nothing on Trusty */