summaryrefslogtreecommitdiffstats
path: root/policy/src/com/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-01-17 15:55:31 -0800
committerJim Miller <jaggies@google.com>2012-01-17 18:11:05 -0800
commit93c518e4f8abd98f87cda1712b30a5a86cfa60dd (patch)
treefd9e7459bf5a228aef50826097a2cc714b8a6013 /policy/src/com/android
parentff321d496a6a07fc667112ecfe4d9a107d44147b (diff)
downloadframeworks_base-93c518e4f8abd98f87cda1712b30a5a86cfa60dd.zip
frameworks_base-93c518e4f8abd98f87cda1712b30a5a86cfa60dd.tar.gz
frameworks_base-93c518e4f8abd98f87cda1712b30a5a86cfa60dd.tar.bz2
Fix 5863053: Add method to lock screen immediately.
This fixes a bug where the device fails to lock when DevicePolicyManagerService requests the device to be locked and the screen was off because the user hit the power button. The change allows DPMS to directly invoke screen lock, bypasssing the screen state. Change-Id: Iecdda6fc61e9c519119de495be23c69c3b983921
Diffstat (limited to 'policy/src/com/android')
-rwxr-xr-xpolicy/src/com/android/internal/policy/impl/PhoneWindowManager.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 0b223c1..6e16391 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -3488,6 +3488,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
};
+ public void lockNow() {
+ mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
+ mHandler.removeCallbacks(mScreenLockTimeout);
+ mHandler.post(mScreenLockTimeout);
+ }
+
private void updateLockScreenTimeout() {
synchronized (mScreenLockTimeout) {
boolean enable = (mAllowLockscreenWhenOn && mScreenOnEarly && mKeyguardMediator.isSecure());