diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-14 19:38:20 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2012-06-14 19:38:20 -0700 |
| commit | b80395c17de91151141411bda4252cdb10912580 (patch) | |
| tree | 69384d4e3e0c441419ecaef28fa2fbd56db97bcb /services/java | |
| parent | 52d3465d0503a3362ec9335ae3de8e23b2ae75a3 (diff) | |
| download | frameworks_base-b80395c17de91151141411bda4252cdb10912580.zip frameworks_base-b80395c17de91151141411bda4252cdb10912580.tar.gz frameworks_base-b80395c17de91151141411bda4252cdb10912580.tar.bz2 | |
Help out issue #6654729: CAB + screen off during playback
People generally expect, if they are using FLAG_KEEP_SCREEN_ON,
that the screen won't immediately dim after it is cleared, even
if it has been passed the user activity timeout since the last
user interaction. So include the flag to reset the user activity
timeout when releasing its wake lock.
Change-Id: If7a8fea8faef3edbf13dff10a2f248adc9e3ff0b
Diffstat (limited to 'services/java')
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 6d5ae71..a5e6f5a 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -885,8 +885,8 @@ public class WindowManagerService extends IWindowManager.Stub filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED); mContext.registerReceiver(mBroadcastReceiver, filter); - mHoldingScreenWakeLock = pmc.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, - "KEEP_SCREEN_ON_FLAG"); + mHoldingScreenWakeLock = pmc.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK + | PowerManager.ON_AFTER_RELEASE, "KEEP_SCREEN_ON_FLAG"); mHoldingScreenWakeLock.setReferenceCounted(false); mInputManager = new InputManagerService(context, mInputMonitor); |