Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 84ec90cb: Fix for 2129239: Always enable the menu hard key in LockScreen when \'ro.monkey\' is set.

Browse Source 
Merge commit '84ec90cbdf950bfa129c30d504f117178c3e3ade'

* commit '84ec90cbdf950bfa129c30d504f117178c3e3ade':
  Fix for 2129239: Always enable the menu hard key in LockScreen when 'ro.monkey' is set.
This commit is contained in:
Jim Miller
2009-10-12 11:24:13 -07:00
committed by Android Git Automerger
parent a463e2b3e1 36931ac9b3
commit 42e7770a99
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/com/android/internal/policy/impl/LockScreen.java
View File

@@ -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();