diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-04-02 21:22:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-02 21:22:59 +0000 |
| commit | ae6ffcc3c74d12ebf59a26cce24d04fdd2b56f4e (patch) | |
| tree | b7e205cea9805bf2c79b4073a267cf3d75c63e66 /core/java/android | |
| parent | ab6e1116340277bcb10637c44335cab37871d8ce (diff) | |
| parent | cff0acb6b1eea23c3f44a078a0a5e81c11faea35 (diff) | |
| download | frameworks_base-ae6ffcc3c74d12ebf59a26cce24d04fdd2b56f4e.zip frameworks_base-ae6ffcc3c74d12ebf59a26cce24d04fdd2b56f4e.tar.gz frameworks_base-ae6ffcc3c74d12ebf59a26cce24d04fdd2b56f4e.tar.bz2 | |
Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 5 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 8f542bb..b13bf88 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -233,4 +233,9 @@ interface IWindowManager * Device is in safe mode. */ boolean isSafeModeEnabled(); + + /** + * Enables the screen if all conditions are met. + */ + void enableScreenIfNeeded(); } diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index bd203c8..db8de66 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -1007,6 +1007,14 @@ public interface WindowManagerPolicy { public void dismissKeyguardLw(); /** + * Ask the policy whether the Keyguard has drawn. If the Keyguard is disabled, this method + * returns true as soon as we know that Keyguard is disabled. + * + * @return true if the keyguard has drawn. + */ + public boolean isKeyguardDrawnLw(); + + /** * Given an orientation constant, returns the appropriate surface rotation, * taking into account sensors, docking mode, rotation lock, and other factors. * |