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

Commit e0018cc7 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Crushing Dreams."

parents f9430aba ee91d94e

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+5 −1
Original line number Diff line number Diff line
@@ -3018,7 +3018,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    Runnable mScreenSaverActivator = new Runnable() {

    Runnable mScreenSaverActivator = null;

    /*new Runnable() {

        public void run() {

            synchronized (this) {

                if (!(mScreenSaverEnabled && mScreenOn)) {
@@ -3049,9 +3050,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        }

    };

    */



    // Must call while holding mLock

    private void updateScreenSaverTimeoutLocked() {

        if (mScreenSaverActivator == null) return;



        synchronized (mScreenSaverActivator) {

            mHandler.removeCallbacks(mScreenSaverActivator);

            if (mScreenSaverEnabled && mScreenOn && mScreenSaverTimeout > 0) {