Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ca38ff4 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 4879c1e8: am 734f0214: Merge "Help out issue #6654729: CAB + screen off... 

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

* commit '4879c1e8':
  Help out issue #6654729: CAB + screen off during playback
parents 84ce6565 4879c1e8

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

+2 −2
Original line number Diff line number Diff line
@@ -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);