diff options
| author | 2021-02-04 01:02:42 +0000 | |
|---|---|---|
| committer | 2021-02-04 01:02:42 +0000 | |
| commit | fc4d69df177cb7b3a8d64deea5c376fd9f4f06e5 (patch) | |
| tree | dcb0bfd57f4bd405b914b38ed459141e47deb4c1 /include/android/bitmap.h | |
| parent | 89c133740ca90cff67bf59e46cc36f15b9cd0412 (diff) | |
| parent | 7af525ef9537b6870dd2717ddf59533c06ba17fe (diff) | |
Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef95
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1561095
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b82c8d01d8c21e346e96eb0c6693b7785937f01
Diffstat (limited to 'include/android/bitmap.h')
| -rw-r--r-- | include/android/bitmap.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/android/bitmap.h b/include/android/bitmap.h index f19539913e..36f70d8e15 100644 --- a/include/android/bitmap.h +++ b/include/android/bitmap.h @@ -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 |