diff options
| author | Jim Miller <jaggies@google.com> | 2009-10-02 16:49:10 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2009-10-02 17:51:30 -0700 |
| commit | 84ec90cbdf950bfa129c30d504f117178c3e3ade (patch) | |
| tree | 61e717b40a2c65033239448425bc3f381a664e2c | |
| parent | dafe18ee8c8d7923580b0d6d03d44ffdb00372e6 (diff) | |
| download | base-84ec90cbdf950bfa129c30d504f117178c3e3ade.tar.gz | |
Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
BUG=2129239
DRNO=discussed with hiroshi/mcleron who gave thumbs up.
| -rw-r--r-- | phone/com/android/internal/policy/impl/LockScreen.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java index 32736f8..a9f3546 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -30,6 +30,8 @@ import android.widget.*; import android.graphics.drawable.Drawable; import android.util.Log; import android.media.AudioManager; +import android.os.SystemProperties; + import com.android.internal.telephony.IccCard; import java.util.Date; @@ -151,7 +153,8 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM mCallback = callback; mDisableMenuKeyInLockScreen = getResources() - .getBoolean(R.bool.config_disableMenuKeyInLockScreen); + .getBoolean(R.bool.config_disableMenuKeyInLockScreen) + && !SystemProperties.getBoolean("ro.monkey", false); mCreatedInPortrait = updateMonitor.isInPortrait(); |