TizenRefApp-8675 [Call UI] Fix issue with VolumeControl button press callback

Change-Id: I9d03369cb87e31b3242bbe457f818456ec4e7aa8

diff --git a/src/model/BluetoothManager.cpp b/src/model/BluetoothManager.cpp
index 0e8dee7d1470c1c35f6b4984f28a6a27157c1704..7ef99598c3c787c80b2c38249b5dfe6a204c1281 100644 (file)
--- a/src/model/BluetoothManager.cpp
+++ b/src/model/BluetoothManager.cpp
@@ -68,7 +68,7 @@ namespace callui {
                return RES_OK;
        }
 
-       int BluetoothManager::getVolume()
+       int BluetoothManager::getVolume() const
        {
                auto vol = 0;
                auto ret = bt_ag_get_speaker_gain(&vol);
@@ -79,7 +79,7 @@ namespace callui {
                return vol;
        }
 
-       int BluetoothManager::getMaxVolume()
+       int BluetoothManager::getMaxVolume() const
        {
                return impl::BT_VOLUME_MAX;
        }

diff --git a/src/model/BluetoothManager.h b/src/model/BluetoothManager.h
index 25b41eeca3ab8e74c26b09877d28286ac03992a6..06478b0921bd81640515b9d8195e2b7ed9b62a42 100644 (file)
--- a/src/model/BluetoothManager.h
+++ b/src/model/BluetoothManager.h
@@ -26,8 +26,8 @@ namespace callui {
                static BluetoothManagerSRef newInstance();
                virtual ~BluetoothManager();
 
-               int getVolume();
-               int getMaxVolume();
+               int getVolume() const;
+               int getMaxVolume() const;
                ucl::Result setVolume(int volume);
 
                void setVolumeStateHandler(const BluetoothVolumeHandler &handler);

diff --git a/src/presenters/AccessoryPresenter.cpp b/src/presenters/AccessoryPresenter.cpp
index af7afef8d77f8b922f1fa0af467768c8a4bca1aa..0d004cfbdccc86bd2aef2f4204c0b7996b5e2fb5 100644 (file)
--- a/src/presenters/AccessoryPresenter.cpp
+++ b/src/presenters/AccessoryPresenter.cpp
@@ -322,6 +322,11 @@ namespace callui {
 
        void AccessoryPresenter::onVolumeControlEventCb(VolumeControlEvent event)
        {
+               if (!m_vcTimer) {
+                       DLOG("Ignore as control is hidden");
+                       return;
+               }
+
                restartVCTimer();
 
                switch (event) {