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

Commit d389684b authored by Bryce Lee's avatar Bryce Lee
Browse files

resolved conflicts for merge of 91d2cbf4 to mnc-dev 

Change-Id: I1c7e2999483a7959630844ecd20f5f37b7896aae
parents b1825fea 91d2cbf4

services/core/java/com/android/server/policy/PhoneWindowManager.java

+7 −1
Original line number Diff line number Diff line
@@ -5381,10 +5381,16 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode) {

        if (!wakeInTheaterMode && isTheaterModeEnabled()) {

        final boolean theaterModeEnabled = isTheaterModeEnabled();

        if (!wakeInTheaterMode && theaterModeEnabled) {

            return false;

        }



        if (theaterModeEnabled) {

            Settings.Global.putInt(mContext.getContentResolver(),

                    Settings.Global.THEATER_MODE_ON, 0);

        }



        mPowerManager.wakeUp(wakeTime);

        return true;

    }