summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2021-01-22 09:44:27 -0800
committer Chong Zhang <chz@google.com> 2021-01-22 10:37:28 -0800
commit2887ed93c5b36bf4c150f3fe17dec770467a4612 (patch)
treeb21543370ab86b89dae200f4289c229277ced799
parent7d321f585b6640a3f605c54370c895e3ea0f0808 (diff)
Remove __ANDROID_API__ guards from thermal.h
__ANDROID_API__ guards are removed in favor of __INTRODUCED_IN macros. bug: 163288375 bug: 169452730 test: builds Change-Id: I145a86a5f8143977c8638aa3a3f14324a488fefb
-rw-r--r--include/android/thermal.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/android/thermal.h b/include/android/thermal.h
index eb81534dc7..0ea13d3a8d 100644
--- a/include/android/thermal.h
+++ b/include/android/thermal.h
@@ -109,8 +109,6 @@ typedef struct AThermalManager AThermalManager;
*/
typedef void (*AThermal_StatusCallback)(void *data, AThermalStatus status);
-#if __ANDROID_API__ >= 30
-
/**
* Acquire an instance of the thermal manager. This must be freed using
* {@link AThermal_releaseManager}.
@@ -179,10 +177,6 @@ int AThermal_registerThermalStatusListener(AThermalManager *manager,
int AThermal_unregisterThermalStatusListener(AThermalManager *manager,
AThermal_StatusCallback callback, void *data) __INTRODUCED_IN(30);
-#endif // __ANDROID_API__ >= 30
-
-#if __ANDROID_API__ >= 31
-
/**
* Provides an estimate of how much thermal headroom the device currently has before
* hitting severe throttling.
@@ -224,8 +218,6 @@ int AThermal_unregisterThermalStatusListener(AThermalManager *manager,
float AThermal_getThermalHeadroom(AThermalManager *manager,
int forecastSeconds) __INTRODUCED_IN(31);
-#endif // __ANDROID_API__ >= 31
-
#ifdef __cplusplus
}
#endif