From 5f728fc04f834bdb4dea4095a88ecaa15d8585c3 Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Sat, 7 Dec 2019 02:22:48 +0900 Subject: [PATCH] Fix nullablity on CameraCapturer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both cameraThreadHandler and surfaceHelper shouldn't be null. Bug: None Change-Id: I3c239c4275c53b836bbc2e9d6af71bf2b1b65387 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161480 Reviewed-by: Sami Kalliomäki Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#30047} --- sdk/android/src/java/org/webrtc/CameraCapturer.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java index 7d65e6f001..15fa9baefd 100644 --- a/sdk/android/src/java/org/webrtc/CameraCapturer.java +++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java @@ -30,7 +30,7 @@ abstract class CameraCapturer implements CameraVideoCapturer { private final static int OPEN_CAMERA_TIMEOUT = 10000; private final CameraEnumerator cameraEnumerator; - @Nullable private final CameraEventsHandler eventsHandler; + private final CameraEventsHandler eventsHandler; private final Handler uiThreadHandler; @Nullable @@ -175,10 +175,10 @@ abstract class CameraCapturer implements CameraVideoCapturer { // Initialized on initialize // ------------------------- - @Nullable private Handler cameraThreadHandler; + private Handler cameraThreadHandler; private Context applicationContext; private org.webrtc.CapturerObserver capturerObserver; - @Nullable private SurfaceTextureHelper surfaceHelper; + private SurfaceTextureHelper surfaceHelper; private final Object stateLock = new Object(); private boolean sessionOpening; /* guarded by stateLock */ @@ -230,13 +230,12 @@ abstract class CameraCapturer implements CameraVideoCapturer { } @Override - public void initialize(@Nullable SurfaceTextureHelper surfaceTextureHelper, - Context applicationContext, org.webrtc.CapturerObserver capturerObserver) { + public void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext, + org.webrtc.CapturerObserver capturerObserver) { this.applicationContext = applicationContext; this.capturerObserver = capturerObserver; this.surfaceHelper = surfaceTextureHelper; - this.cameraThreadHandler = - surfaceTextureHelper == null ? null : surfaceTextureHelper.getHandler(); + this.cameraThreadHandler = surfaceTextureHelper.getHandler(); } @Override