commit e6fcf3ff6c093c89f712974a71ccc33157e665f3
author Sami Kalliomäki <sakal@webrtc.org> Tue Jul 17 11:25:52 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Jul 17 13:31:43 2018 +0000
tree 160c501aab581ba147cfce7ed587bfb09bb6a3e3
parent ca536d469208e2b3a187347823b162029721e22f

Update CameraCapturer to use the new CapturerObserver.

Full path is specified because otherwise the inner class from
VideoCapturer is used instead.

Bug: webrtc:9496
Change-Id: I122e6525101594863d506eb3c12359b5648d935e
Reviewed-on: https://webrtc-review.googlesource.com/89042
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24006}

sdk/android/src/java/org/webrtc/CameraCapturer.java

diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java
index 08c6c6b..6addd36 100644
--- a/sdk/android/src/java/org/webrtc/CameraCapturer.java
+++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java
@@ -13,8 +13,8 @@
 import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
-import javax.annotation.Nullable;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 @SuppressWarnings("deprecation")
 abstract class CameraCapturer implements CameraVideoCapturer {
@@ -177,7 +177,7 @@
   // -------------------------
   @Nullable private Handler cameraThreadHandler;
   private Context applicationContext;
-  private CapturerObserver capturerObserver;
+  private org.webrtc.CapturerObserver capturerObserver;
   @Nullable private SurfaceTextureHelper surfaceHelper;
 
   private final Object stateLock = new Object();
@@ -231,7 +231,7 @@
 
   @Override
   public void initialize(@Nullable SurfaceTextureHelper surfaceTextureHelper,
-      Context applicationContext, CapturerObserver capturerObserver) {
+      Context applicationContext, org.webrtc.CapturerObserver capturerObserver) {
     this.applicationContext = applicationContext;
     this.capturerObserver = capturerObserver;
     this.surfaceHelper = surfaceTextureHelper;