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 | 79ac69821730c10465333e6ea2d98a77d63b79c8 (patch) | |
| tree | 4684a22059a53db4ad1543452a5511341bdeb942 /policy/com | |
| parent | 0e425247d6c7ab00e27704265ab08d2f8cb50e76 (diff) | |
| parent | 2530ee3b58d520beaca8bdefee02ed4a44df8f4d (diff) | |
| download | frameworks_base-79ac69821730c10465333e6ea2d98a77d63b79c8.zip frameworks_base-79ac69821730c10465333e6ea2d98a77d63b79c8.tar.gz frameworks_base-79ac69821730c10465333e6ea2d98a77d63b79c8.tar.bz2 | |
am a6946bde: am 27517b21: Still use ro.monkey
Merge commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7'
* commit 'a6946bdedeaeb86b9f47a0e7e48cb2011540f3e7':
Still use ro.monkey
Diffstat (limited to 'policy/com')
| -rw-r--r-- | policy/com/android/internal/policy/impl/LockScreen.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java index 881b330..7ec4a40 100644 --- a/policy/com/android/internal/policy/impl/LockScreen.java +++ b/policy/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; } |