summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2013-06-21 10:16:05 +0000
committerGerrit Code Review <gerrit@ip-10-141-129-99.ec2.internal>2013-06-21 10:16:05 +0000
commitfe7be20c03ef53993d5465ea1a363b1ed3ef6a76 (patch)
treee4c1f087f6c5246eb661dc791ea846a2f79eeaf6
parentf68ef8bae1bb3492b3edbc4ba664428a83ea7865 (diff)
parent7725c9b1069b069db880414b063d641a76b99271 (diff)
downloadbase-linaro_android_4.2.2_stayawake.tar.gz
Merge "Revert "Choreographer: make DEFAULT_FRAME_DELAY can be changed by using property"" into linaro_android_4.2.2_stayawakelinaro_android_4.2.2_stayawake
-rw-r--r--core/java/android/view/Choreographer.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/Choreographer.java b/core/java/android/view/Choreographer.java
index f9b712fca667..b6617480764f 100644
--- a/core/java/android/view/Choreographer.java
+++ b/core/java/android/view/Choreographer.java
@@ -78,8 +78,7 @@ public final class Choreographer {
// for jitter and hardware variations). Regardless of this value, the animation
// and display loop is ultimately rate-limited by how fast new graphics buffers can
// be dequeued.
- private static final long DEFAULT_FRAME_DELAY = SystemProperties.getInt(
- "debug.choreographer.skipwarning", 10);
+ private static final long DEFAULT_FRAME_DELAY = 10;
// The number of milliseconds between animation frames.
private static volatile long sFrameDelay = DEFAULT_FRAME_DELAY;