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

Merge commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7'

* commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7':
  Still use ro.monkey
This commit is contained in:
Ying Wang
2010-01-06 13:57:46 -08:00
committed by Android Git Automerger

View File

@@ -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;
}