commit 36931ac9b3cc2e8f60f730c51e715744b5c4f6c0
author Jim Miller <jaggies@google.com> Fri Oct 02 16:49:10 2009 -0700
committer Jim Miller <jaggies@google.com> Fri Oct 02 17:51:30 2009 -0700
tree c15273a899e8b812f3f2d5bcb7301c761a934292
parent 9227af057130e650604b60b02c3879019e850ad3

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

diff --git a/policy/com/android/internal/policy/impl/LockScreen.java b/policy/com/android/internal/policy/impl/LockScreen.java
index 32736f8..a9f35467 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.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 @@
         mCallback = callback;
 
         mDisableMenuKeyInLockScreen = getResources()
-            .getBoolean(R.bool.config_disableMenuKeyInLockScreen);
+            .getBoolean(R.bool.config_disableMenuKeyInLockScreen)
+            && !SystemProperties.getBoolean("ro.monkey", false);
 
         mCreatedInPortrait = updateMonitor.isInPortrait();