diff options
| author | Jim Miller <jaggies@google.com> | 2012-01-18 16:44:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 16:44:52 -0800 |
| commit | 230a709285abc5dfd92f05d91a8997d52a59d3c7 (patch) | |
| tree | 782118afed3a59641c740dc5a32559b80eccc3cc /core | |
| parent | db2e71635968f455ad4f41b2e24fb8b909c24ca0 (diff) | |
| parent | 93c518e4f8abd98f87cda1712b30a5a86cfa60dd (diff) | |
| download | frameworks_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 'core')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 93a9d50..c54d09e 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -229,4 +229,9 @@ interface IWindowManager * Device has a software navigation bar (separate from the status bar). */ boolean hasNavigationBar(); + + /** + * Lock the device immediately. + */ + void lockNow(); } diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 8ab468d..cbaa3df 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -1028,6 +1028,11 @@ public interface WindowManagerPolicy { public boolean hasNavigationBar(); /** + * Lock the device now. + */ + public void lockNow(); + + /** * Print the WindowManagerPolicy's state into the given stream. * * @param prefix Text to print at the front of each line. |