Add SurfaceTextureHelper.disconnect(Handler handler) method

talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 295 matching lines @@
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     // swapBuffers() will ultimately trigger onTextureFrameAvailable().
     eglOesBase.swapBuffers();
     eglOesBase.release();
 
     // Wait for an OES texture to arrive.
     listener.waitForNewFrame();
 
     // Return the frame from this thread.
     surfaceTextureHelper.returnTextureFrame();
-    surfaceTextureHelper.disconnect();
-    thread.quitSafely();
+    surfaceTextureHelper.disconnect(handler);
+  }
+
+  /**
+   * Test use SurfaceTextureHelper on a separate thread. A uniform texture frame is created and
+   * received on a thread separate from the test thread and returned after disconnect.
+   */
+  @MediumTest
+  public static void testLateReturnFrameOnSeparateThread() throws InterruptedException {
+    final HandlerThread thread = new HandlerThread("SurfaceTextureHelperTestThread");
+    thread.start();
+    final Handler handler = new Handler(thread.getLooper());
+
+    // Create SurfaceTextureHelper and listener.
+    final SurfaceTextureHelper surfaceTextureHelper =
+        SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT, handler);
+    // Create a mock listener and expect frames to be delivered on |thread|.
+    final MockTextureListener listener = new MockTextureListener(thread);
+    surfaceTextureHelper.setListener(listener);
+
+    // Create resources for stubbing an OES texture producer. |eglOesBase| has the
+    // SurfaceTexture in |surfaceTextureHelper| as the target EGLSurface.
+    final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
+    eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
+    eglOesBase.makeCurrent();
+    // Draw a frame onto the SurfaceTexture.
+    GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+    // swapBuffers() will ultimately trigger onTextureFrameAvailable().
+    eglOesBase.swapBuffers();
+    eglOesBase.release();
+
+    // Wait for an OES texture to arrive.
+    listener.waitForNewFrame();
+
+    surfaceTextureHelper.disconnect(handler);
+
+    surfaceTextureHelper.returnTextureFrame();
   }
 }