From 36931ac9b3cc2e8f60f730c51e715744b5c4f6c0 Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Fri, 2 Oct 2009 16:49:10 -0700 Subject: [PATCH] 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. --- policy/com/android/internal/policy/impl/LockScreen.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java index 32736f838d368..a9f35467293e3 100644 --- a/policy/com/android/internal/policy/impl/LockScreen.java +++ b/policy/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();