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

* commit '734f0214ec04e6c734aeec78d15f6db478cfb55c':
  Help out issue #6654729: CAB + screen off during playback
This commit is contained in:
Dianne Hackborn
2012-06-14 21:35:55 -07:00
committed by Android Git Automerger

View File

@@ -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);