Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79ac6982 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am a6946bde: am 27517b21: Still use ro.monkey 

Merge commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7'

* commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7':
  Still use ro.monkey
parents 0e425247 2530ee3b

policy/com/android/internal/policy/impl/LockScreen.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 
    private boolean shouldEnableMenuKey() {

        final Resources res = getResources();

        final boolean configDisabled = res.getBoolean(R.bool.config_disableMenuKeyInLockScreen);

        final boolean isMonkey = SystemProperties.getBoolean("monkey.running", false);

        final boolean isMonkey = SystemProperties.getBoolean("ro.monkey", false);

        final boolean fileOverride = (new File(ENABLE_MENU_KEY_FILE)).exists();

        return !configDisabled || isMonkey || fileOverride;

    }