summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2013-09-19 15:50:11 -0700
committerJim Miller <jaggies@google.com>2013-09-27 16:29:36 -0700
commit6c9df5054a25f179ea7359a1a5e59e7d5d8da122 (patch)
treecd0cde11c23f7e26ebbec49b9e2d6b0e1885fb54 /core/java/android/view
parent1962e264660b37b7e386eb2ac84fc915dd7c75dd (diff)
downloadframeworks_base-6c9df5054a25f179ea7359a1a5e59e7d5d8da122.zip
frameworks_base-6c9df5054a25f179ea7359a1a5e59e7d5d8da122.tar.gz
frameworks_base-6c9df5054a25f179ea7359a1a5e59e7d5d8da122.tar.bz2
Fix permissions on WindowManagerService.showAssistant()
Since binder call permissions are not transitive by design, the proper way to fix this is to have the call talk directly to keyguard from the navigation bar. Fixes bug 9409008 Change-Id: Ibd90a79bb638c969b514455a2ad93c6ff668222d
Diffstat (limited to 'core/java/android/view')
-rw-r--r--core/java/android/view/IWindowManager.aidl6
-rw-r--r--core/java/android/view/WindowManagerPolicy.java6
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.