From be67da3291e584f215aa6d315bf2a2c51463cadc Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Fri, 9 Jun 2017 14:31:39 +0300 Subject: [PATCH] TizenRefApp-8675 [Call UI] Fix issue with VolumeControl button press callback Change-Id: I9d03369cb87e31b3242bbe457f818456ec4e7aa8 --- src/model/BluetoothManager.cpp | 4 ++-- src/model/BluetoothManager.h | 4 ++-- src/presenters/AccessoryPresenter.cpp | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/model/BluetoothManager.cpp b/src/model/BluetoothManager.cpp index 0e8dee7..7ef9959 100644 --- 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 25b41ee..06478b0 100644 --- 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 af7afef..0d004cf 100644 --- 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) { -- 2.34.1