Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
Fix handling of device lock on non-NEMO devices

See merge request mer-core/voicecall!20
  • Loading branch information
pvuorela committed Aug 20, 2019
2 parents ee588f9 + 0a212a8 commit 3dfedcf
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/voicecallmanager.cpp
Expand Up @@ -339,13 +339,11 @@ void VoiceCallManager::onVoiceCallAdded(AbstractVoiceCallHandler *handler)
#ifdef WITH_NEMO_DEVICELOCK
if (!handler->isEmergency()
&& d->deviceLock.state() == NemoDeviceLock::DeviceLock::ManagerLockout) {
#else
if (!handler->isEmergency()) {
#endif
handler->hangup();
return;

}
#endif

//AudioCallPolicyProxy *pHandler = new AudioCallPolicyProxy(handler, this);
d->voiceCalls.insert(handler->handlerId(), handler);
Expand Down

0 comments on commit 3dfedcf

Please sign in to comment.