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

Commit ba726113 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Revert "Synthesize fake vsyncs when the screen is off." 

This reverts commit 858491ba

It turns out that Surface Flinger is supposed to generate fake vsyncs while the screen is off, but sometimes it wasn't working due to a bug.  That bug has now been fixed by the following change: I7c6abc23bb021d1dfc94f101bd3ce18e3a81a73e
parent 858491ba

core/java/android/view/Choreographer.java

+6 −36
Original line number Diff line number Diff line
@@ -79,16 +79,6 @@ public final class Choreographer { 
    // be dequeued.

    private static final long DEFAULT_FRAME_DELAY = 10;



    // The fake vsync delay in milliseconds.

    // When the screen is off, we might not receive real vsync pulses from the hardware

    // which would cause posted Choreographer callbacks to not run.  This is bad because

    // messages in the Looper might be blocked behind a barrier that is scheduled to be

    // removed by one of those Choreographer callback (see ViewRootImpl.doTraversals).

    // Until the barrier is removed, those messages will not run.  To prevent starvation

    // of the Looper, we synthesize fake vsync pulses at a reduced rate whenever the

    // display hardware stops generating them.

    private static final long FAKE_VSYNC_DELAY = 100;



    // The number of milliseconds between animation frames.

    private static volatile long sFrameDelay = DEFAULT_FRAME_DELAY;
@@ -123,7 +113,6 @@ public final class Choreographer { 
    private static final int MSG_DO_FRAME = 0;

    private static final int MSG_DO_SCHEDULE_VSYNC = 1;

    private static final int MSG_DO_SCHEDULE_CALLBACK = 2;

    private static final int MSG_FAKE_VSYNC = 3;



    // All frame callbacks posted by applications have this token.

    private static final Object FRAME_CALLBACK_TOKEN = new Object() {
@@ -598,13 +587,6 @@ public final class Choreographer { 


    private void scheduleVsyncLocked() {

        mDisplayEventReceiver.scheduleVsync();



        // Post a message to simulate a fake vsync pulse at a reduced rate in case the

        // display hardware stops generating them.  This ensures that Choreographer

        // callbacks can continue to run even if the screen is off.

        Message msg = mHandler.obtainMessage(MSG_FAKE_VSYNC);

        msg.setAsynchronous(true);

        mHandler.sendMessageDelayed(msg, FAKE_VSYNC_DELAY);

    }



    private boolean isRunningOnLooperThreadLocked() {
@@ -680,12 +662,6 @@ public final class Choreographer { 
                case MSG_DO_SCHEDULE_CALLBACK:

                    doScheduleCallback(msg.arg1);

                    break;

                case MSG_FAKE_VSYNC:

                    if (DEBUG) {

                        Log.d(TAG, "Handling fake vsync while screen is off.");

                    }

                    doFrame(System.nanoTime(), 0);

                    break;

            }

        }

    }
@@ -707,17 +683,6 @@ public final class Choreographer { 
            // the message queue.  If there are no messages in the queue with timestamps

            // earlier than the frame time, then the vsync event will be processed immediately.

            // Otherwise, messages that predate the vsync event will be handled first.

            if (mHavePendingVsync) {

                if (DEBUG) {

                    Log.d(TAG, "Already have a pending vsync event.  There should only be "

                            + "one at a time but they can double up when a fake vsync "

                            + "is handled in place of a real one.");

                }

                mHandler.removeCallbacks(this);

            } else {

                mHavePendingVsync = true;

            }



            long now = System.nanoTime();

            if (timestampNanos > now) {

                Log.w(TAG, "Frame time is " + ((timestampNanos - now) * 0.000001f)
@@ -726,7 +691,12 @@ public final class Choreographer { 
                timestampNanos = now;

            }



            mHandler.removeMessages(MSG_FAKE_VSYNC);

            if (mHavePendingVsync) {

                Log.w(TAG, "Already have a pending vsync event.  There should only be "

                        + "one at a time.");

            } else {

                mHavePendingVsync = true;

            }



            mTimestampNanos = timestampNanos;

            mFrame = frame;