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

Commit 5595f76d authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 4d3a9728: Rename ro.monkey to monkey.running 

Merge commit '4d3a9728c27ff8959b8da93325b52e8ff7b67b12' into eclair-plus-aosp

* commit '4d3a9728c27ff8959b8da93325b52e8ff7b67b12':
  Rename ro.monkey to monkey.running
parents 63e4f498 a3a430e4

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

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,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("ro.monkey", false);

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

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

        return !configDisabled || isMonkey || fileOverride;

    }