Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bc1322031c
1 changed files with 1 additions and 1 deletions
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue