Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802, 2481613, 2481668, 2481614, 2481594, 2481595, 2481548, 2481744, 2481493, 2481494, 2481709] into oc-releaseandroid-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r4android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1oreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-release

Change-Id: I885f5f290d2e60f2df0c6c777139915c42541607

1 files changed, 3 insertions, 3 deletions

diff --git a/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
index 23d7e969a96..469e99a9d6b 100644
--- a/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
+++ b/common/device-side/util/src/com/android/compatibility/common/util/MediaPerfUtils.java
@@ -31,10 +31,10 @@ public class MediaPerfUtils {
     private static final int MOVING_AVERAGE_NUM_FRAMES = 10;
     private static final int MOVING_AVERAGE_WINDOW_MS = 1000;
 
-    // allow a variance of 2.5x for measured frame rates (e.g. 40% of lower-limit to 2.5x of
-    // upper-limit of the published values). Also allow an extra 20% margin. This also acts as
+    // allow a variance of 2x for measured frame rates (e.g. half of lower-limit to double of
+    // upper-limit of the published values). Also allow an extra 10% margin. This also acts as
     // a limit for the size of the published rates (e.g. upper-limit / lower-limit <= tolerance).
-    private static final double FRAMERATE_TOLERANCE = 2.5 * 1.2;
+    private static final double FRAMERATE_TOLERANCE = 2.0 * 1.1;
 
     /*
      *  ------------------ HELPER METHODS FOR ACHIEVABLE FRAME RATES ------------------