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

Commit 734f0214 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents 5c74bca4 b80395c1

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