commit 734f0214ec04e6c734aeec78d15f6db478cfb55c
author Dianne Hackborn <hackbod@google.com> Thu Jun 14 21:33:48 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 21:33:48 2012 -0700
tree 1ddcec621b2f27ecf5a809a9ce2933722fa9a687
parent 5c74bca49a48c3316aca9fed00d287cb8cbc2be4
parent b80395c17de91151141411bda4252cdb10912580

Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev

services/java/com/android/server/wm/WindowManagerService.java

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 5d9dce7..6c8d969 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -885,8 +885,8 @@
         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);