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,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.
|
||||
|
||||
Reference in New Issue
Block a user