diff options
| author | Ying Wang <wangying@google.com> | 2010-01-06 13:57:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-06 13:57:46 -0800 |
| commit | 4923b6cde94534ebc0957d0c0361a5cd125b5b98 (patch) | |
| tree | cffaaf843a8f6439ea0c97f7f5b06f84e468eeee | |
| parent | 340fa7677e613ab32e54093d6a334aeecba38bcb (diff) | |
| parent | a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7 (diff) | |
| download | base-4923b6cde94534ebc0957d0c0361a5cd125b5b98.tar.gz | |
am a6946bde: am 27517b21: Still use ro.monkey
Merge commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7'
* commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7':
Still use ro.monkey
| -rw-r--r-- | phone/com/android/internal/policy/impl/LockScreen.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java index 881b330..7ec4a40 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -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; } |