diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-09-23 12:57:44 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2011-09-23 13:39:33 -0700 |
| commit | 90c52de28691ca0bbbf7c039ef20f85ce46882cc (patch) | |
| tree | 3a6dcf93f186f44561a312927d7fe2e97e45f6d4 /core/java/android/view | |
| parent | 67c5b1251178532726964c2e0f4229d079ff0a3e (diff) | |
| download | frameworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.zip frameworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.tar.gz frameworks_base-90c52de28691ca0bbbf7c039ef20f85ce46882cc.tar.bz2 | |
Fix issue #5173952: Opening a Notification From Lock Screen...
...Should Skip Unsecure Lockscreen (ICS)
Also while I am in there, clean up logging of intent objects to include
even less sensitive information, while showing the true Intent in dump
output (since apps can't get to that).
Change-Id: I35fed714645b21e4304ba38a11ebb9c4c963538e
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 1 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index 55c821d..45f9da2 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -116,6 +116,7 @@ interface IWindowManager boolean isKeyguardLocked(); boolean isKeyguardSecure(); boolean inKeyguardRestrictedInputMode(); + void dismissKeyguard(); void closeSystemDialogs(String reason); diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index 1dbb083..9c7b2a9 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -850,6 +850,11 @@ public interface WindowManagerPolicy { public boolean inKeyguardRestrictedKeyInputMode(); /** + * Ask the policy to dismiss the keyguard, if it is currently shown. + */ + public void dismissKeyguardLw(); + + /** * Given an orientation constant, returns the appropriate surface rotation, * taking into account sensors, docking mode, rotation lock, and other factors. * |