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}
diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
index 9aee730..7ae3d83 100644
--- a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
+++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
@@ -87,7 +87,7 @@
private AudioDevice userSelectedAudioDevice;
// Contains speakerphone setting: auto, true or false
- private final String useSpeakerphone;
+ @Nullable private final String useSpeakerphone;
// Proximity sensor object. It measures the proximity of an object in cm
// relative to the view screen of a device and can therefore be used to
diff --git a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index 2bd52cb..97da9d9 100644
--- a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -23,6 +23,7 @@
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
import android.util.Log;
import android.view.ContextMenu;
import android.view.KeyEvent;
@@ -300,6 +301,7 @@
* Get a value from the shared preference or from the intent, if it does not
* exist the default is used.
*/
+ @Nullable
private String sharedPrefGetString(
int attributeId, String intentName, int defaultId, boolean useFromIntent) {
String defaultValue = getString(defaultId);
diff --git a/sdk/android/api/org/webrtc/Camera2Enumerator.java b/sdk/android/api/org/webrtc/Camera2Enumerator.java
index 69c030d..b32b3ad 100644
--- a/sdk/android/api/org/webrtc/Camera2Enumerator.java
+++ b/sdk/android/api/org/webrtc/Camera2Enumerator.java
@@ -78,6 +78,7 @@
== CameraMetadata.LENS_FACING_BACK;
}
+ @Nullable
@Override
public List<CaptureFormat> getSupportedFormats(String deviceName) {
return getSupportedFormats(context, deviceName);
@@ -165,11 +166,13 @@
}
}
+ @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)) {
diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
index e675d13..bf5a734 100644
--- a/sdk/android/api/org/webrtc/PeerConnection.java
+++ b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -395,6 +395,7 @@
}
}
+ @Nullable
@CalledByNative("AdapterType")
static AdapterType fromNativeIndex(int nativeIndex) {
return BY_BITMASK.get(nativeIndex);
diff --git a/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
index c40aca0..023e92c 100644
--- a/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
+++ b/sdk/android/src/java/org/webrtc/WebRtcClassLoader.java
@@ -18,6 +18,10 @@
class WebRtcClassLoader {
@CalledByNative
static Object getClassLoader() {
- return WebRtcClassLoader.class.getClassLoader();
+ Object loader = WebRtcClassLoader.class.getClassLoader();
+ if (loader == null) {
+ throw new RuntimeException("Failed to get WebRTC class loader.");
+ }
+ return loader;
}
}