Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-17 09:34:46 +01:00
commit bc1322031c

View file

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