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
@ -15,13 +15,13 @@ import android.media.MediaCodec;
|
||||
import android.media.MediaCodecInfo.CodecCapabilities;
|
||||
import android.media.MediaFormat;
|
||||
import android.os.SystemClock;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.Surface;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.BlockingDeque;
|
||||
import java.util.concurrent.LinkedBlockingDeque;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.ThreadUtils.ThreadChecker;
|
||||
|
||||
/**
|
||||
|
||||
@ -11,16 +11,16 @@
|
||||
package org.webrtc;
|
||||
|
||||
import android.content.Context;
|
||||
import android.graphics.Matrix;
|
||||
import android.os.Handler;
|
||||
import android.os.SystemClock;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.Surface;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
|
||||
import android.graphics.Matrix;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
class Camera1Session implements CameraSession {
|
||||
|
||||
@ -23,7 +23,7 @@ import android.hardware.camera2.CameraMetadata;
|
||||
import android.hardware.camera2.CaptureFailure;
|
||||
import android.hardware.camera2.CaptureRequest;
|
||||
import android.os.Handler;
|
||||
import javax.annotation.Nullable;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.util.Range;
|
||||
import android.view.Surface;
|
||||
import java.util.Arrays;
|
||||
|
||||
@ -13,8 +13,8 @@ package org.webrtc;
|
||||
import android.content.Context;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.Arrays;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
abstract class CameraCapturer implements CameraVideoCapturer {
|
||||
|
||||
@ -13,7 +13,7 @@ package org.webrtc;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Rect;
|
||||
import android.graphics.SurfaceTexture;
|
||||
import javax.annotation.Nullable;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.Surface;
|
||||
import android.view.SurfaceHolder;
|
||||
import javax.microedition.khronos.egl.EGL10;
|
||||
|
||||
@ -19,7 +19,7 @@ import android.opengl.EGLDisplay;
|
||||
import android.opengl.EGLExt;
|
||||
import android.opengl.EGLSurface;
|
||||
import android.os.Build;
|
||||
import javax.annotation.Nullable;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.Surface;
|
||||
import org.webrtc.EglBase;
|
||||
|
||||
|
||||
@ -12,8 +12,8 @@ package org.webrtc;
|
||||
|
||||
import android.opengl.GLES11Ext;
|
||||
import android.opengl.GLES20;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.nio.FloatBuffer;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.GlShader;
|
||||
import org.webrtc.GlUtil;
|
||||
import org.webrtc.RendererCommon;
|
||||
|
||||
@ -17,6 +17,7 @@ import android.media.MediaCodecInfo;
|
||||
import android.media.MediaFormat;
|
||||
import android.opengl.GLES20;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.view.Surface;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
@ -25,7 +26,6 @@ import java.util.Map;
|
||||
import java.util.concurrent.BlockingDeque;
|
||||
import java.util.concurrent.LinkedBlockingDeque;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.ThreadUtils.ThreadChecker;
|
||||
|
||||
/**
|
||||
|
||||
@ -15,9 +15,9 @@ import android.media.MediaCodec;
|
||||
import android.media.MediaCodecInfo;
|
||||
import android.media.MediaCodecInfo.CodecCapabilities;
|
||||
import android.os.Build;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/** Container class for static constants and helpers used with MediaCodec. */
|
||||
// We are forced to use the old API because we want to support API level < 21.
|
||||
|
||||
@ -17,10 +17,10 @@ import android.media.MediaCodecInfo;
|
||||
import android.media.MediaCodecInfo.CodecCapabilities;
|
||||
import android.media.MediaCodecList;
|
||||
import android.os.Build;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/** Factory for decoders backed by Android MediaCodec API. */
|
||||
@SuppressWarnings("deprecation") // API level 16 requires use of deprecated methods.
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
import java.nio.ByteBuffer;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class NV12Buffer implements VideoFrame.Buffer {
|
||||
private final int width;
|
||||
|
||||
@ -10,9 +10,9 @@
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public class NV21Buffer implements VideoFrame.Buffer {
|
||||
private final byte[] data;
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import android.support.annotation.Nullable;
|
||||
import org.webrtc.VideoFrame;
|
||||
|
||||
/**
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
/**
|
||||
* Implementation of RefCounted that executes a Runnable once the ref count reaches zero.
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
package org.webrtc;
|
||||
|
||||
// Explicit imports necessary for JNI generation.
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.VideoEncoder;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.nio.ByteBuffer;
|
||||
import org.webrtc.VideoEncoder;
|
||||
|
||||
/**
|
||||
* This class contains the Java glue code for JNI generation of VideoEncoder.
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
package org.webrtc.audio;
|
||||
|
||||
import android.media.AudioManager;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.Logging;
|
||||
|
||||
// TODO(magjed): Do we really need to spawn a new thread just to log volume? Can we re-use the
|
||||
|
||||
@ -16,9 +16,9 @@ import android.media.audiofx.AudioEffect.Descriptor;
|
||||
import android.media.audiofx.AutomaticGainControl;
|
||||
import android.media.audiofx.NoiseSuppressor;
|
||||
import android.os.Build;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.Logging;
|
||||
|
||||
// This class wraps control of three different platform effects. Supported
|
||||
|
||||
@ -17,11 +17,11 @@ import android.media.AudioRecord;
|
||||
import android.media.MediaRecorder.AudioSource;
|
||||
import android.os.Build;
|
||||
import android.os.Process;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.lang.System;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.CalledByNative;
|
||||
import org.webrtc.Logging;
|
||||
import org.webrtc.ThreadUtils;
|
||||
|
||||
@ -18,9 +18,9 @@ import android.media.AudioManager;
|
||||
import android.media.AudioTrack;
|
||||
import android.os.Build;
|
||||
import android.os.Process;
|
||||
import android.support.annotation.Nullable;
|
||||
import java.lang.Thread;
|
||||
import java.nio.ByteBuffer;
|
||||
import javax.annotation.Nullable;
|
||||
import org.webrtc.CalledByNative;
|
||||
import org.webrtc.Logging;
|
||||
import org.webrtc.ThreadUtils;
|
||||
|
||||
Reference in New Issue
Block a user