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/SurfaceTextureHelper.java

diff --git a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
index 3aaa4e2..eefc153 100644
--- a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
+++ b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
@@ -20,6 +20,7 @@
 import android.os.HandlerThread;
 import java.nio.ByteBuffer;
 import java.util.concurrent.Callable;
+import javax.annotation.Nullable;
 import org.webrtc.EglBase;
 import org.webrtc.VideoFrame.TextureBuffer;
 
@@ -62,6 +63,7 @@
     // Therefore, in order to control the callback thread on API lvl < 21, the SurfaceTextureHelper
     // is constructed on the |handler| thread.
     return ThreadUtils.invokeAtFrontUninterruptibly(handler, new Callable<SurfaceTextureHelper>() {
+      @Nullable
       @Override
       public SurfaceTextureHelper call() {
         try {
@@ -81,14 +83,14 @@
   private YuvConverter yuvConverter;
 
   // These variables are only accessed from the |handler| thread.
-  private OnTextureFrameAvailableListener listener;
+  @Nullable private OnTextureFrameAvailableListener listener;
   // The possible states of this class.
   private boolean hasPendingTexture = false;
   private volatile boolean isTextureInUse = false;
   private boolean isQuitting = false;
   // |pendingListener| is set in setListener() and the runnable is posted to the handler thread.
   // setListener() is not allowed to be called again before stopListening(), so this is thread safe.
-  private OnTextureFrameAvailableListener pendingListener;
+  @Nullable private OnTextureFrameAvailableListener pendingListener;
   final Runnable setListenerRunnable = new Runnable() {
     @Override
     public void run() {