summaryrefslogtreecommitdiff
path: root/native
diff options
context:
space:
mode:
author Matt Buckley <mattbuckley@google.com> 2023-02-07 02:10:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-02-07 02:10:58 +0000
commit712f58a6f6a628c009e0cf548b33c9e11d9415de (patch)
treec1d2f6459c58f3bdb066fee0a68eb1d7000439f2 /native
parent9c64b1bcf61c2bd732a5c0c99c32fcdb2372aafe (diff)
Revert "Use "SessionHint" enum in ndk API"
Revert submission 21161765-sessionhint_api Reason for revert: this broke the main-finalization-1 build... somehow. see b/268111957 Reverted changes: /q/submissionid:21161765-sessionhint_api Change-Id: I23ca8da4957aa030d7788d22fc946259e34ee3cf
Diffstat (limited to 'native')
-rw-r--r--native/android/performance_hint.cpp6
-rw-r--r--native/android/tests/performance_hint/PerformanceHintNativeTest.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/native/android/performance_hint.cpp b/native/android/performance_hint.cpp
index b3628fa3e5ce..27666caafac4 100644
--- a/native/android/performance_hint.cpp
+++ b/native/android/performance_hint.cpp
@@ -69,7 +69,7 @@ public:
int updateTargetWorkDuration(int64_t targetDurationNanos);
int reportActualWorkDuration(int64_t actualDurationNanos);
- int sendHint(SessionHint hint);
+ int sendHint(int32_t hint);
int setThreads(const int32_t* threadIds, size_t size);
int getThreadIds(int32_t* const threadIds, size_t* size);
@@ -243,7 +243,7 @@ int APerformanceHintSession::reportActualWorkDuration(int64_t actualDurationNano
return 0;
}
-int APerformanceHintSession::sendHint(SessionHint hint) {
+int APerformanceHintSession::sendHint(int32_t hint) {
if (hint < 0 || hint >= static_cast<int32_t>(mLastHintSentTimestamp.size())) {
ALOGE("%s: invalid session hint %d", __FUNCTION__, hint);
return EINVAL;
@@ -335,7 +335,7 @@ void APerformanceHint_closeSession(APerformanceHintSession* session) {
delete session;
}
-int APerformanceHint_sendHint(void* session, SessionHint hint) {
+int APerformanceHint_sendHint(void* session, int32_t hint) {
return reinterpret_cast<APerformanceHintSession*>(session)->sendHint(hint);
}
diff --git a/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp b/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp
index 791adfd33fcd..321a7dddb144 100644
--- a/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp
+++ b/native/android/tests/performance_hint/PerformanceHintNativeTest.cpp
@@ -127,7 +127,7 @@ TEST_F(PerformanceHintTest, TestSession) {
result = APerformanceHint_reportActualWorkDuration(session, -1L);
EXPECT_EQ(EINVAL, result);
- SessionHint hintId = SessionHint::CPU_LOAD_RESET;
+ int hintId = 2;
EXPECT_CALL(*iSession, sendHint(Eq(hintId))).Times(Exactly(1));
result = APerformanceHint_sendHint(session, hintId);
EXPECT_EQ(0, result);
@@ -140,7 +140,7 @@ TEST_F(PerformanceHintTest, TestSession) {
result = APerformanceHint_sendHint(session, hintId);
EXPECT_EQ(0, result);
- result = APerformanceHint_sendHint(session, static_cast<SessionHint>(-1));
+ result = APerformanceHint_sendHint(session, -1);
EXPECT_EQ(EINVAL, result);
EXPECT_CALL(*iSession, close()).Times(Exactly(1));