diff options
| author | 2021-02-04 01:27:20 +0000 | |
|---|---|---|
| committer | 2021-02-04 01:27:20 +0000 | |
| commit | 202b5ab5b8b5f74f9040a5aa127a9a8ad8ff5bd7 (patch) | |
| tree | d10fbb2f8a8130f6f27b81a8c7f094960c6aafb3 /include/android/configuration.h | |
| parent | 819a4e805eabdcb6a320b263ef2dcc24c513138f (diff) | |
| parent | fc4d69df177cb7b3a8d64deea5c376fd9f4f06e5 (diff) | |
Merge "Remove __ANDROID_API__ #if checks." am: 7af525ef95 am: fc4d69df17
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1561095
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I130b2513bd243d9d4866a73b2d7e74b1221931fc
Diffstat (limited to 'include/android/configuration.h')
| -rw-r--r-- | include/android/configuration.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/android/configuration.h b/include/android/configuration.h index ccf3e59066..88019ae054 100644 --- a/include/android/configuration.h +++ b/include/android/configuration.h @@ -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 |