Add @Nullable annotations to quiet errorprone.
Those are preventive annotations to prepare for incoming android update (coming with Chromium roll). Currently the roll is blocked partly because errorprone complains! Bug: webrtc:11095, chromium:1003532 Change-Id: If4e2879a522e895ce7fb1f2a9ad36d06f98f2a61 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/160002 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Commit-Queue: Yves Gerey <yvesg@google.com> Cr-Commit-Position: refs/heads/master@{#29830}
This commit is contained in:
@ -78,6 +78,7 @@ public class Camera2Enumerator implements CameraEnumerator {
|
||||
== CameraMetadata.LENS_FACING_BACK;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<CaptureFormat> getSupportedFormats(String deviceName) {
|
||||
return getSupportedFormats(context, deviceName);
|
||||
@ -165,11 +166,13 @@ public class Camera2Enumerator implements CameraEnumerator {
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
static List<CaptureFormat> getSupportedFormats(Context context, String cameraId) {
|
||||
return getSupportedFormats(
|
||||
(CameraManager) context.getSystemService(Context.CAMERA_SERVICE), cameraId);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
static List<CaptureFormat> getSupportedFormats(CameraManager cameraManager, String cameraId) {
|
||||
synchronized (cachedSupportedFormats) {
|
||||
if (cachedSupportedFormats.containsKey(cameraId)) {
|
||||
|
||||
@ -395,6 +395,7 @@ public class PeerConnection {
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@CalledByNative("AdapterType")
|
||||
static AdapterType fromNativeIndex(int nativeIndex) {
|
||||
return BY_BITMASK.get(nativeIndex);
|
||||
|
||||
Reference in New Issue
Block a user