diff options
| author | Jim Miller <jaggies@google.com> | 2013-09-28 01:18:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-28 01:18:17 +0000 |
| commit | fb2e3c8d47c162166a029a97d68ad3bedff89cce (patch) | |
| tree | 3ad0bdcbe8f6ed37152d692536a20af80b0bf09c /core | |
| parent | b415525a16074b6dc8e295655648b7c7c1074bbb (diff) | |
| parent | 6c9df5054a25f179ea7359a1a5e59e7d5d8da122 (diff) | |
| download | frameworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.zip frameworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.tar.gz frameworks_base-fb2e3c8d47c162166a029a97d68ad3bedff89cce.tar.bz2 | |
Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/IWindowManager.aidl | 6 | ||||
| -rw-r--r-- | core/java/android/view/WindowManagerPolicy.java | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl index aea2799..caf9c8b 100644 --- a/core/java/android/view/IWindowManager.aidl +++ b/core/java/android/view/IWindowManager.aidl @@ -249,12 +249,6 @@ interface IWindowManager boolean isSafeModeEnabled(); /** - * Tell keyguard to show the assistant (Intent.ACTION_ASSIST) after asking for the user's - * credentials. - */ - void showAssistant(); - - /** * Sets the display magnification callbacks. These callbacks notify * the client for contextual changes related to display magnification. * diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java index e116662..79c0b3c 100644 --- a/core/java/android/view/WindowManagerPolicy.java +++ b/core/java/android/view/WindowManagerPolicy.java @@ -1176,12 +1176,6 @@ public interface WindowManagerPolicy { public void dump(String prefix, PrintWriter writer, String[] args); /** - * Ask keyguard to invoke the assist intent after dismissing keyguard - * {@link android.content.Intent#ACTION_ASSIST} - */ - public void showAssistant(); - - /** * Returns whether a given window type can be magnified. * * @param windowType The window type. |