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

Commit 202b5ab5 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef am: fc4d69df 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I130b2513bd243d9d4866a73b2d7e74b1221931fc
parents 819a4e80 fc4d69df

include/android/bitmap.h

+0 −8
Original line number Diff line number Diff line
@@ -117,8 +117,6 @@ typedef struct { 
int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,

                          AndroidBitmapInfo* info);



#if __ANDROID_API__ >= 30



/**

 * Given a java bitmap object, return its {@link ADataSpace}.

 *
@@ -130,8 +128,6 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap, 
 */

int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap)  __INTRODUCED_IN(30);



#endif // __ANDROID_API__ >= 30



/**

 * Given a java bitmap object, attempt to lock the pixel address.

 * Locking will ensure that the memory for the pixels will not move
@@ -152,8 +148,6 @@ int AndroidBitmap_lockPixels(JNIEnv* env, jobject jbitmap, void** addrPtr); 
 */

int AndroidBitmap_unlockPixels(JNIEnv* env, jobject jbitmap);



#if __ANDROID_API__ >= 30



// Note: these values match android.graphics.Bitmap#compressFormat.



/**
@@ -254,8 +248,6 @@ typedef struct AHardwareBuffer AHardwareBuffer; 
int AndroidBitmap_getHardwareBuffer(JNIEnv* env, jobject bitmap,

        AHardwareBuffer** outBuffer) __INTRODUCED_IN(30);



#endif // __ANDROID_API__ >= 30



#ifdef __cplusplus

}

#endif

include/android/choreographer.h

+0 −11
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ typedef void (*AChoreographer_frameCallback64)(int64_t frameTimeNanos, void* dat 
 */

typedef void (*AChoreographer_refreshRateCallback)(int64_t vsyncPeriodNanos, void* data);



#if __ANDROID_API__ >= 24



/**

 * Get the AChoreographer instance for the current thread. This must be called

 * on an ALooper thread.
@@ -86,10 +84,6 @@ void AChoreographer_postFrameCallbackDelayed(AChoreographer* choreographer, 
                                             long delayMillis) __INTRODUCED_IN(24)

        __DEPRECATED_IN(29);



#endif /* __ANDROID_API__ >= 24 */



#if __ANDROID_API__ >= 29



/**

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

 * be passed to the callback function when it's called.
@@ -111,10 +105,6 @@ void AChoreographer_postFrameCallbackDelayed64(AChoreographer* choreographer, 
                                               AChoreographer_frameCallback64 callback, void* data,

                                               uint32_t delayMillis) __INTRODUCED_IN(29);



#endif /* __ANDROID_API__ >= 29 */



#if __ANDROID_API__ >= 30



/**

 * Registers a callback to be run when the display refresh rate changes. The

 * data pointer provided will be passed to the callback function when it's
@@ -160,7 +150,6 @@ void AChoreographer_registerRefreshRateCallback(AChoreographer* choreographer, 
void AChoreographer_unregisterRefreshRateCallback(AChoreographer* choreographer,

                                                  AChoreographer_refreshRateCallback, void* data)

        __INTRODUCED_IN(30);

#endif /* __ANDROID_API__ >= 30 */



__END_DECLS

include/android/configuration.h

+0 −4
Original line number Diff line number Diff line
@@ -645,14 +645,12 @@ int32_t AConfiguration_getScreenLong(AConfiguration* config); 
 */

void AConfiguration_setScreenLong(AConfiguration* config, int32_t screenLong);



#if __ANDROID_API__ >= 30

/**

 * Return the current ACONFIGURATION_SCREENROUND_* set in the configuration.

 *

 * Available since API level 30.

 */

int32_t AConfiguration_getScreenRound(AConfiguration* config) __INTRODUCED_IN(30);

#endif



/**

 * Set the current screen round in the configuration.
@@ -712,7 +710,6 @@ int32_t AConfiguration_getSmallestScreenWidthDp(AConfiguration* config); 
 */

void AConfiguration_setSmallestScreenWidthDp(AConfiguration* config, int32_t value);



#if __ANDROID_API__ >= 17

/**

 * Return the configuration's layout direction, or

 * ACONFIGURATION_LAYOUTDIR_ANY if not set.
@@ -727,7 +724,6 @@ int32_t AConfiguration_getLayoutDirection(AConfiguration* config) __INTRODUCED_I 
 * Available since API level 17.

 */

void AConfiguration_setLayoutDirection(AConfiguration* config, int32_t value) __INTRODUCED_IN(17);

#endif /* __ANDROID_API__ >= 17 */



/**

 * Perform a diff between two configurations.  Returns a bit mask of

include/android/font.h

+0 −4
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 29



enum {

    /** The minimum value fot the font weight value. */

    AFONT_WEIGHT_MIN = 0,
@@ -297,8 +295,6 @@ uint32_t AFont_getAxisTag(const AFont* _Nonnull font, uint32_t axisIndex) 
float AFont_getAxisValue(const AFont* _Nonnull font, uint32_t axisIndex)

      __INTRODUCED_IN(29);



#endif // __ANDROID_API__ >= 29



__END_DECLS



#endif // ANDROID_FONT_H

include/android/font_matcher.h

+0 −4
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ 


__BEGIN_DECLS



#if __ANDROID_API__ >= 29



enum {

    /** A family variant value for the system default variant. */

    AFAMILY_VARIANT_DEFAULT = 0,
@@ -217,8 +215,6 @@ AFont* _Nonnull AFontMatcher_match( 
        const uint32_t textLength,

        uint32_t* _Nullable runLengthOut) __INTRODUCED_IN(29);



#endif // __ANDROID_API__ >= 29



__END_DECLS



#endif // ANDROID_FONT_MATCHER_H