diff options
| author | Roman Birg <roman@cyngn.com> | 2014-04-24 22:22:45 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-26 02:32:21 -0700 |
| commit | 565a22d702e689edfaaf108b96ec7d8d8f1109e5 (patch) | |
| tree | 20d391813d53f39761f2095c36d051fc1ec17799 /services/core/java/com/android/server/wm/WindowManagerService.java | |
| parent | 46bb690eed5ac4ddb4fa0139098a5f92969573c1 (diff) | |
| download | frameworks_base-565a22d702e689edfaaf108b96ec7d8d8f1109e5.zip frameworks_base-565a22d702e689edfaaf108b96ec7d8d8f1109e5.tar.gz frameworks_base-565a22d702e689edfaaf108b96ec7d8d8f1109e5.tar.bz2 | |
frameworks: add keyguard wallpaper functionality to WallpaperManager
Adapted for cm-12.
Change-Id: I0eb1b5578b705c2ade4c0772fa86e09478b9f73e
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'services/core/java/com/android/server/wm/WindowManagerService.java')
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 909639f..ca08471 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -5466,7 +5466,7 @@ public class WindowManagerService extends IWindowManager.Stub @Override public void keyguardGoingAway(boolean disableWindowAnimations, - boolean keyguardGoingToNotificationShade) { + boolean keyguardGoingToNotificationShade, boolean keyguardShowingMedia) { if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.DISABLE_KEYGUARD) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires DISABLE_KEYGUARD permission"); @@ -5477,6 +5477,7 @@ public class WindowManagerService extends IWindowManager.Stub mAnimator.mKeyguardGoingAway = true; mAnimator.mKeyguardGoingAwayToNotificationShade = keyguardGoingToNotificationShade; mAnimator.mKeyguardGoingAwayDisableWindowAnimations = disableWindowAnimations; + mAnimator.mKeyguardGoingAwayShowingMedia = keyguardShowingMedia; requestTraversalLocked(); } } |