diff options
| author | Jim Miller <jaggies@google.com> | 2012-11-08 15:47:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 15:47:04 -0800 |
| commit | 061b4fae3daf40c90b46e16b12e7f22142eb498c (patch) | |
| tree | 152e92dd48a0043fae26e6bc18e524f847f3d617 /services | |
| parent | 70eeec5c06db3bf38e94d95a284d393e79bf87a0 (diff) | |
| parent | a2bf6181dfca0f93461fc041f2bd2444551a4515 (diff) | |
| download | frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.zip frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.tar.gz frameworks_base-061b4fae3daf40c90b46e16b12e7f22142eb498c.tar.bz2 | |
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
Add mechanism to kick keyguard to show the assistant
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 4659c9d..7e4490e 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -10352,6 +10352,15 @@ public class WindowManagerService extends IWindowManager.Stub return mSafeMode; } + public void showAssistant() { + // TODO: What permission? + if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER) + != PackageManager.PERMISSION_GRANTED) { + return; + } + mPolicy.showAssistant(); + } + void dumpPolicyLocked(PrintWriter pw, String[] args, boolean dumpAll) { pw.println("WINDOW MANAGER POLICY STATE (dumpsys window policy)"); mPolicy.dump(" ", pw, args); |