summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2012-01-18 16:44:52 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-18 16:44:52 -0800
commit230a709285abc5dfd92f05d91a8997d52a59d3c7 (patch)
tree782118afed3a59641c740dc5a32559b80eccc3cc /policy
parentdb2e71635968f455ad4f41b2e24fb8b909c24ca0 (diff)
parent93c518e4f8abd98f87cda1712b30a5a86cfa60dd (diff)
downloadframeworks_base-230a709285abc5dfd92f05d91a8997d52a59d3c7.zip
frameworks_base-230a709285abc5dfd92f05d91a8997d52a59d3c7.tar.gz
frameworks_base-230a709285abc5dfd92f05d91a8997d52a59d3c7.tar.bz2
Merge "Fix 5863053: Add method to lock screen immediately." into ics-mr1
Diffstat (limited to 'policy')
-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 eeade05..7c9f0b5 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());