| Index: talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| index 6d6093f2868786698aa865951cd89068bfac7815..47fe780124960a1e0a63bfd4b47fde8bfc375a72 100644
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| +++ b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| @@ -28,7 +28,6 @@
|
| package org.webrtc;
|
|
|
| import android.graphics.Point;
|
| -import android.opengl.EGL14;
|
| import android.test.ActivityTestCase;
|
| import android.test.suitebuilder.annotation.MediumTest;
|
| import android.view.View.MeasureSpec;
|
| @@ -37,6 +36,8 @@ import java.nio.ByteBuffer;
|
| import java.util.Arrays;
|
| import java.util.List;
|
|
|
| +import javax.microedition.khronos.egl.EGL10;
|
| +
|
| public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
|
| /**
|
| * List with all possible scaling types.
|
| @@ -110,7 +111,7 @@ public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
|
| }
|
|
|
| // Test behaviour after SurfaceViewRenderer.init() is called, but still no frame.
|
| - surfaceViewRenderer.init(EGL14.EGL_NO_CONTEXT, null);
|
| + surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null);
|
| for (RendererCommon.ScalingType scalingType : scalingTypes) {
|
| for (int measureSpecMode : measureSpecModes) {
|
| final int zeroMeasureSize = MeasureSpec.makeMeasureSpec(0, measureSpecMode);
|
| @@ -133,7 +134,7 @@ public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
|
| public void testFrame1280x720() {
|
| final SurfaceViewRenderer surfaceViewRenderer =
|
| new SurfaceViewRenderer(getInstrumentation().getContext());
|
| - surfaceViewRenderer.init(EGL14.EGL_NO_CONTEXT, null);
|
| + surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null);
|
|
|
| // Test different rotation degress, but same rotated size.
|
| for (int rotationDegree : new int[] {0, 90, 180, 270}) {
|
|
|