Use android Nullable instead of javax Nullable
This is a propagation of upstream chromium change needed to resume DEPS autorolls into WebRTC. Original comment from upstream change: > This change is made in preparation for an ErrorProne > check to catch this at compile time. See bug for details. Bug: chromium:771683 Change-Id: I56aed15f73a633dcadae7ece6c645cd3596f9257 Reviewed-on: https://webrtc-review.googlesource.com/c/113505 Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Artem Titarenko <artit@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25951}
This commit is contained in:
committed by
Commit Bot
parent
57011626bd
commit
69540f4419
@ -18,6 +18,7 @@ import static org.junit.Assert.fail;
|
||||
import android.annotation.TargetApi;
|
||||
import android.graphics.Matrix;
|
||||
import android.opengl.GLES11Ext;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.test.filters.SmallTest;
|
||||
import android.util.Log;
|
||||
import java.nio.ByteBuffer;
|
||||
@ -26,7 +27,6 @@ import java.util.List;
|
||||
import java.util.concurrent.BlockingQueue;
|
||||
import java.util.concurrent.LinkedBlockingQueue;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.annotation.Nullable;
|
||||
import org.chromium.base.test.params.BaseJUnit4RunnerDelegate;
|
||||
import org.chromium.base.test.params.ParameterAnnotations.ClassParameter;
|
||||
import org.chromium.base.test.params.ParameterAnnotations.UseRunnerDelegate;
|
||||
|
||||
Reference in New Issue
Block a user