diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-05-28 15:52:34 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-05-28 15:52:34 +0400 |
| commit | d21a350b4531a4f5d4782cd6ef05138e87efcebe (patch) | |
| tree | 13c5ee31da3c5586bfea0ae766611fd6449e734a /policy | |
| parent | d749f5b2cac6bd3004d00dc6e5ac22dfb05acbd7 (diff) | |
| parent | d23319d2f761e9f1e775946e4ffc6999d988d0de (diff) | |
| download | frameworks_base-d21a350b4531a4f5d4782cd6ef05138e87efcebe.zip frameworks_base-d21a350b4531a4f5d4782cd6ef05138e87efcebe.tar.gz frameworks_base-d21a350b4531a4f5d4782cd6ef05138e87efcebe.tar.bz2 | |
Merge "Make 'Power button instantly locks' toggle work (1/2 framework)" into ics
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 8976c3c..f03d93d 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -363,7 +363,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, if (mLockPatternUtils.isSecure()) { // Lock immediately based on setting if secure (user has a pin/pattern/password) // This is retained as-is to ensue AOSP security integrity is maintained - lockImmediately = true; + lockImmediately = mLockPatternUtils.getPowerButtonInstantlyLocks(); } else { // Unless a separate slide lock timeout is enabled, this "locks" the device when // not secure to provide easy access to the camera while preventing unwanted input |