commit 9c712bb40433475174510f6a71cf269c23c222fc
author Sami Kalliomäki <sakal@webrtc.org> Mon Oct 21 17:06:02 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Wed Oct 30 09:18:54 2019 +0000
tree 4387d3a1a47069354c8ebd73a18bdd8c6768314d
parent f298855981d7ce4dce0b8338ad5994db048ec0e1

Fix invalid @Nullable handling in TextureBufferImpl.

Bug: None
Change-Id: Ic0b75c62512e9bcb88d562c754e4ed38058a5ece
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/157886
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29650}

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

diff --git a/sdk/android/api/org/webrtc/TextureBufferImpl.java b/sdk/android/api/org/webrtc/TextureBufferImpl.java
index 3d3bbab..8d75216 100644
--- a/sdk/android/api/org/webrtc/TextureBufferImpl.java
+++ b/sdk/android/api/org/webrtc/TextureBufferImpl.java
@@ -39,7 +39,7 @@
   private final Handler toI420Handler;
   private final YuvConverter yuvConverter;
   private final RefCountDelegate refCountDelegate;
-  private final @Nullable RefCountMonitor refCountMonitor;
+  private final RefCountMonitor refCountMonitor;
 
   public TextureBufferImpl(int width, int height, Type type, int id, Matrix transformMatrix,
       Handler toI420Handler, YuvConverter yuvConverter, @Nullable Runnable releaseCallback) {
@@ -53,7 +53,9 @@
 
           @Override
           public void onDestroy(TextureBufferImpl textureBuffer) {
-            releaseCallback.run();
+            if (releaseCallback != null) {
+              releaseCallback.run();
+            }
           }
         });
   }