diff --git a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp index 031f25fc085bce256736a59ba7223ee77317eb77..7c3e1ee1126d5adb5384f3b480b60b580c2040cf 100644 --- a/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp +++ b/frameworks/core/frame_aware_collector/src/rme_core_sched.cpp @@ -69,7 +69,6 @@ void RmeCoreSched::BeginFlushAnimation() if (!m_uiHasSend) { StartTrace(HITRACE_TAG_ACE, ("FrameS-Begin&AddThread-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); - AddThreadToRtg(m_uiTid, m_rtg); m_uiHasSend = true; } else { StartTrace(HITRACE_TAG_ACE, "FrameS-Begin"); @@ -143,7 +142,7 @@ void RmeCoreSched::HandleEndScene() if (m_rtg <= 0) { return; } - int ret = EndScene(m_rtg); + int ret = 0; m_uiHasSend = false; StartTrace(HITRACE_TAG_ACE, ("FrameS-EndFrameFreq-rtg:" + to_string(m_rtg) + " ret:" + to_string(ret)).c_str()); diff --git a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp index 740bdbf78bd25cd1d5a471598451a043a57eeb53..fa17b79049592c6e71cc84f9e25904eebfe1e054 100644 --- a/frameworks/core/frame_aware_policy/src/intellisense_server.cpp +++ b/frameworks/core/frame_aware_policy/src/intellisense_server.cpp @@ -139,6 +139,7 @@ void IntelliSenseServer::NewBackground(int pid) iter->SetAppState(AppState::APP_BACKGROUND); int grpId = iter->GetRtgrp(); if (grpId > 0) { + EndScene(grpId); DestroyRtgGrp(grpId); } } @@ -165,6 +166,7 @@ void IntelliSenseServer::NewDiedProcess(int pid) if (iter->GetAppPid() == pid) { int grpId = iter->GetRtgrp(); if (grpId > 0) { + EndScene(grpId); DestroyRtgGrp(grpId); } iter = m_historyApp.erase(iter); diff --git a/interfaces/inner_api/qos.h b/interfaces/inner_api/qos.h index 28553f7c03b1eb0639b0c88afb4854e46d3de732..98a82b86d9695b9009c6eac6db7097be5733fdfb 100644 --- a/interfaces/inner_api/qos.h +++ b/interfaces/inner_api/qos.h @@ -22,9 +22,7 @@ enum class QosLevel { qos_background = 1, qos_utility, qos_default, - qos_user_initiated, - qos_deadline_request, - qos_user_interactive, + qos_user_initiated = 4, }; class QosController { diff --git a/qos_manager/src/qos_manager.cpp b/qos_manager/src/qos_manager.cpp index 9dfdc7c19c6c9c286e3ff846cc71c70e14139247..ec30133bf4bb10e73c98a9a30e26722dddb9075c 100644 --- a/qos_manager/src/qos_manager.cpp +++ b/qos_manager/src/qos_manager.cpp @@ -127,7 +127,7 @@ int QosController::SetPolicy() int QosController::SetThreadQosForOtherThread(enum QosLevel level, int tid) { int qos = static_cast(level); - if (level < QosLevel::qos_background || level > QosLevel::qos_user_interactive) { + if (level < QosLevel::qos_background || level > QosLevel::qos_user_initiated) { RME_LOGE("invalid qos level %{public}d", qos); return ERROR_NUM; } diff --git a/test/unittest/phone/qos_manager_test.cpp b/test/unittest/phone/qos_manager_test.cpp index b0e7e1b521566ad6094d892921e6718b28f307cb..ce4d8e6178b30e479f1f9b128a810d5f3d96e583 100644 --- a/test/unittest/phone/qos_manager_test.cpp +++ b/test/unittest/phone/qos_manager_test.cpp @@ -61,10 +61,6 @@ HWTEST_F(QosManagerTest, SetThreadQosTest1, TestSize.Level1) EXPECT_EQ(ret, 0); ret = SetThreadQos(QosLevel::qos_background); EXPECT_EQ(ret, 0); - ret = SetThreadQos(QosLevel::qos_deadline_request); - EXPECT_EQ(ret, 0); - ret = SetThreadQos(QosLevel::qos_user_interactive); - EXPECT_EQ(ret, 0); } HWTEST_F(QosManagerTest, SetThreadQosTest3, TestSize.Level1) @@ -77,10 +73,6 @@ HWTEST_F(QosManagerTest, SetThreadQosTest3, TestSize.Level1) EXPECT_EQ(ret, 0); ret = SetQosForOtherThread(QosLevel::qos_background, gettid()); EXPECT_EQ(ret, 0); - ret = SetQosForOtherThread(QosLevel::qos_deadline_request, gettid()); - EXPECT_EQ(ret, 0); - ret = SetQosForOtherThread(QosLevel::qos_user_interactive, gettid()); - EXPECT_EQ(ret, 0); } HWTEST_F(QosManagerTest, ResetThreadQosTest1, TestSize.Level1)