commit e7592d8d5fed88abc1bf8f4ee2492aa98cd63bb9
author Sami Kalliomäki <sakal@webrtc.org> Thu Mar 22 13:32:44 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Thu Mar 22 13:13:44 2018 +0000
tree 4cf565e83bb1fcda651ac8680c747e20533c907d
parent 12d6a49e97701eebc753e13822355b823190ef4c

Annotate libjingle_peerconnection_java with @Nullable.

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

sdk/android/api/org/webrtc/Camera1Capturer.java

diff --git a/sdk/android/api/org/webrtc/Camera1Capturer.java b/sdk/android/api/org/webrtc/Camera1Capturer.java
index 41352ab..27b2df7 100644
--- a/sdk/android/api/org/webrtc/Camera1Capturer.java
+++ b/sdk/android/api/org/webrtc/Camera1Capturer.java
@@ -12,6 +12,7 @@
 
 import android.content.Context;
 import android.media.MediaRecorder;
+import javax.annotation.Nullable;
 
 public class Camera1Capturer extends CameraCapturer {
   private final boolean captureToTexture;
@@ -26,8 +27,8 @@
   @Override
   protected void createCameraSession(CameraSession.CreateSessionCallback createSessionCallback,
       CameraSession.Events events, Context applicationContext,
-      SurfaceTextureHelper surfaceTextureHelper, MediaRecorder mediaRecorder, String cameraName,
-      int width, int height, int framerate) {
+      SurfaceTextureHelper surfaceTextureHelper, @Nullable MediaRecorder mediaRecorder,
+      String cameraName, int width, int height, int framerate) {
     Camera1Session.create(createSessionCallback, events,
         captureToTexture || (mediaRecorder != null), applicationContext, surfaceTextureHelper,
         mediaRecorder, Camera1Enumerator.getCameraIndex(cameraName), width, height, framerate);