Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev

Browse Source 
* commit '5aa02e20186a9e30553a8ef0d53d5fad4c0b7597':
  Revert "Synthesize fake vsyncs when the screen is off."
This commit is contained in:
Jeff Brown
2012-06-18 10:32:39 -07:00
committed by Android Git Automerger
parent 5250db0bfd 5aa02e2018
commit 4440d158b8
1 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/java/android/view/Choreographer.java
View File

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