Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4994e61d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add deprecation message." into main am: cf2f81a8 am: 7869c733 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3073284



Change-Id: I724c2b28e3306f57170a208944abfdfc5156e3d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76488200 7869c733

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

include/android/looper.h

+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.

include/android/sensor.h

+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