diff --git a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
index 2bd1e62324..ed7e250b65 100644
--- a/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
+++ b/webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java
@@ -223,7 +223,6 @@ public class VideoCapturerAndroidTestFixtures {
   static public void release(VideoCapturerAndroid capturer) {
     assertNotNull(capturer);
     capturer.dispose();
-    assertTrue(capturer.isDisposed());
   }
 
   static public void startCapturerAndRender(VideoCapturerAndroid capturer)
@@ -238,7 +237,6 @@ public class VideoCapturerAndroidTestFixtures {
     track.dispose();
     source.dispose();
     factory.dispose();
-    assertTrue(capturer.isDisposed());
   }
 
   static public void switchCamera(VideoCapturerAndroid capturer) throws InterruptedException {
@@ -278,7 +276,6 @@ public class VideoCapturerAndroidTestFixtures {
     track.dispose();
     source.dispose();
     factory.dispose();
-    assertTrue(capturer.isDisposed());
   }
 
   static public void cameraEventsInvoked(VideoCapturerAndroid capturer, CameraEvents events,
@@ -351,7 +348,6 @@ public class VideoCapturerAndroidTestFixtures {
     track.dispose();
     source.dispose();
     factory.dispose();
-    assertTrue(capturer.isDisposed());
   }
 
   static public void startStopWithDifferentResolutions(VideoCapturerAndroid capturer,
@@ -526,7 +522,6 @@ public class VideoCapturerAndroidTestFixtures {
     track.dispose();
     source.dispose();
     factory.dispose();
-    assertTrue(capturer.isDisposed());
 
     // Return the frame(s), on a different thread out of spite.
     final List<I420Frame> pendingFrames = renderer.waitForPendingFrames();
@@ -604,7 +599,6 @@ public class VideoCapturerAndroidTestFixtures {
     track.dispose();
     source.dispose();
     factory.dispose();
-    assertTrue(capturer.isDisposed());
 
     assertTrue(gotExpectedResolution);
   }
diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index e4c33d50a0..5c59318ea9 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -47,7 +47,6 @@ public class VideoCapturerAndroid implements
   private final static String TAG = "VideoCapturerAndroid";
   private static final int CAMERA_STOP_TIMEOUT_MS = 7000;
 
-  private boolean isDisposed = false;
   private android.hardware.Camera camera;  // Only non-null while capturing.
   private final Object handlerLock = new Object();
   // |cameraThreadHandler| must be synchronized on |handlerLock| when not on the camera thread,
@@ -257,25 +256,9 @@ public class VideoCapturerAndroid implements
     }
   }
 
-  // Dispose the SurfaceTextureHelper. This needs to be done manually, otherwise the
-  // SurfaceTextureHelper thread and resources will not be garbage collected.
   @Override
   public void dispose() {
-    Logging.d(TAG, "release");
-    if (isDisposed()) {
-      throw new IllegalStateException("Already released");
-    }
-    synchronized (handlerLock) {
-      if (cameraThreadHandler != null) {
-        throw new IllegalStateException("dispose() called while camera is running");
-      }
-    }
-    isDisposed = true;
-  }
-
-  // Used for testing purposes to check if dispose() has been called.
-  public boolean isDisposed() {
-    return isDisposed;
+    Logging.d(TAG, "dispose");
   }
 
   // Note that this actually opens the camera, and Camera callbacks run on the