| 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 47fe780124960a1e0a63bfd4b47fde8bfc375a72..341c632b584c9641ae18958303211a92760d2b0d 100644
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| +++ b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceViewRendererOnMeasureTest.java
|
| @@ -36,8 +36,6 @@ 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.
|
| @@ -111,7 +109,7 @@ public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
|
| }
|
|
|
| // Test behaviour after SurfaceViewRenderer.init() is called, but still no frame.
|
| - surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null);
|
| + surfaceViewRenderer.init((EglBase.Context) null, null);
|
| for (RendererCommon.ScalingType scalingType : scalingTypes) {
|
| for (int measureSpecMode : measureSpecModes) {
|
| final int zeroMeasureSize = MeasureSpec.makeMeasureSpec(0, measureSpecMode);
|
| @@ -134,7 +132,7 @@ public final class SurfaceViewRendererOnMeasureTest extends ActivityTestCase {
|
| public void testFrame1280x720() {
|
| final SurfaceViewRenderer surfaceViewRenderer =
|
| new SurfaceViewRenderer(getInstrumentation().getContext());
|
| - surfaceViewRenderer.init(EGL10.EGL_NO_CONTEXT, null);
|
| + surfaceViewRenderer.init((EglBase.Context) null, null);
|
|
|
| // Test different rotation degress, but same rotated size.
|
| for (int rotationDegree : new int[] {0, 90, 180, 270}) {
|
|
|