[Ring] Play feedback and sound as it is set in alarm

Currently alarm plays sound and vibrates even if it was not set
in edit/create alarm view. This patch fixes this issue.

Change-Id: Ie2f919084a87c062144b61776db0d25255e6542d

diff --git a/clock/src/Model/Ring.cpp b/clock/src/Model/Ring.cpp
index db0d577..a84a414 100644 (file)
--- a/clock/src/Model/Ring.cpp
+++ b/clock/src/Model/Ring.cpp
@@ -37,8 +37,10 @@ namespace model {
 
                counter_.Run();
 
-               SoundPlay();
-               VibrationStart();
+               if (!alarm_ || alarm_->GetType() != Alarm::Type::VIBRATION)
+                       SoundPlay();
+               if (!alarm_ || alarm_->GetType() != Alarm::Type::SOUND_ONLY)
+                       VibrationStart();
 
                return true;
        }