[lipstick] Android notifications to wake display only if having feedb…

…ack. Contributes to JB#38924
sailfishos · Feb 2, 2018 · e433cae · e433cae
1 parent 9fde2b2
commit e433cae
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/notifications/notificationmanager.cpp b/src/notifications/notificationmanager.cpp
@@ -333,10 +333,14 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
             priority = m_androidPriorityStore->appDetails(appName);
         }
         hints_.insert(LipstickNotification::HINT_PRIORITY, priority.first);
+
         if (!priority.second.isEmpty()) {
             hints_.insert(LipstickNotification::HINT_FEEDBACK, priority.second);
-            // Also turn the display on if required
-            hints_.insert(LipstickNotification::HINT_DISPLAY_ON, true);
+            // Also turn the display on if required, but only if it's really playing vibra or sound feedback
+            if (hints_.value(LipstickNotification::HINT_VIBRA, false).toBool()
+                    || !hints_.value(LipstickNotification::HINT_SUPPRESS_SOUND, false).toBool()) {
+                hints_.insert(LipstickNotification::HINT_DISPLAY_ON, true);
+            }
         }
     } else {
         if (notification->appName().isEmpty() && !pidProperties.first.isEmpty()) {