Merge "Revert "Use "SessionHint" enum in ndk API"" (05a3ad2d) · Commits · e / os / android_frameworks_base

native/android/performance_hint.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -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));