3 files changed, 10 insertions(+), 7 deletions(-)

M module-services/service-evtmgr/EventManager.cpp
M products/BellHybrid/services/evtmgr/EventManager.cpp
M products/PurePhone/services/evtmgr/EventManager.cpp

@@ 284,13 284,6 @@ void EventManagerCommon::handleKeyEvent(sys::Message *msg)
     auto message    = std::make_shared<sevm::KbdMessage>();
     message->key    = kbdMessage->key;
 
-    if (message->key.state == RawKey::State::Pressed) {
-        const auto code = message->key.keyCode;
-        if (code == bsp::KeyCodes::FnRight) {
-            bus.sendUnicast(message, service::name::system_manager);
-        }
-    }
-
     // send key to focused application
     if (!targetApplication.empty()) {
         bus.sendUnicast(message, targetApplication);

@@ 55,6 55,10 @@ void EventManager::handleKeyEvent(sys::Message *msg)
     if (kbdMessage == nullptr) {
         return;
     }
+    if (kbdMessage->key.keyCode == bsp::KeyCodes::JoystickEnter) {
+        // Power key notification
+        bus.sendUnicast(std::make_shared<sevm::KbdMessage>(), service::name::system_manager);
+    }
 
     if (kbdMessage->key.state == RawKey::State::Pressed || kbdMessage->key.state == RawKey::State::Moved) {
         userActivityHandler.handleUserInput();

@@ 166,6 166,12 @@ void EventManager::handleKeyEvent(sys::Message *msg)
     EventManagerCommon::handleKeyEvent(msg);
 
     auto kbdMessage = dynamic_cast<sevm::KbdMessage *>(msg);
+    if (kbdMessage->key.state == RawKey::State::Pressed) {
+        if (kbdMessage->key.keyCode == bsp::KeyCodes::FnRight) {
+            // Power key notification
+            bus.sendUnicast(std::make_shared<sevm::KbdMessage>(), service::name::system_manager);
+        }
+    }
 
     if (kbdMessage->key.state == RawKey::State::Pressed) {
         backlightHandler.handleKeyPressed(kbdMessage->key.keyCode);