Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-11-17 09:34:46 +01:00
commit bc1322031c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -839,7 +839,7 @@ public class MapActivity extends AccessibleActivity implements
if (mDevicePolicyManager != null && mDeviceAdmin != null) { if (mDevicePolicyManager != null && mDeviceAdmin != null) {
final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get(); final Integer screenPowerSave = settings.WAKE_ON_VOICE_INT.get();
if (screenPowerSave > 0) { if (screenPowerSave > 0 && settings.MAP_ACTIVITY_ENABLED.get()) {
if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) { if (mDevicePolicyManager.isAdminActive(mDeviceAdmin)) {
try { try {
mDevicePolicyManager.lockNow(); mDevicePolicyManager.lockNow();