Replace the android support annotation library with androidx's one.
This change does not affect downstream dependencies as androidx.annotation
is fully compatible with android.support.annotation.
Bug: webrtc:11962
Change-Id: I714b473df8d0fee8000ddf3a9beca7c5613db5ff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226881
Commit-Queue: Xavier Lepaul <xalep@webrtc.org>
Reviewed-by: Xavier Lepaul <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34839}
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 0a7eabd..8dd998c 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -150,7 +150,7 @@
"../sdk/android:video_api_java",
"../sdk/android:video_java",
"androidapp/third_party/autobanh:autobanh_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -864,7 +864,7 @@
"../sdk/android:peerconnection_java",
"../sdk/android:video_api_java",
"../sdk/android:video_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -880,7 +880,7 @@
"../rtc_base:base_java",
"../sdk/android:libjingle_peerconnection_java",
"../sdk/android:libjingle_peerconnection_metrics_default_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
diff --git a/examples/aarproject/app/build.gradle b/examples/aarproject/app/build.gradle
index 77dc370..d47dedb 100644
--- a/examples/aarproject/app/build.gradle
+++ b/examples/aarproject/app/build.gradle
@@ -46,7 +46,7 @@
implementation fileTree(dir: project.aarDir, include: ['google-webrtc-*.aar'])
}
implementation fileTree(dir: '../../androidapp/third_party/autobanh/lib', include: ['autobanh.jar'])
- implementation 'com.android.support:support-annotations:26.1.0'
+ implementation 'androidx.annotation:annotation:1.2.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
diff --git a/examples/aarproject/gradle.properties b/examples/aarproject/gradle.properties
index aac7c9b..2e87c52 100644
--- a/examples/aarproject/gradle.properties
+++ b/examples/aarproject/gradle.properties
@@ -15,3 +15,8 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
index 00ffc9f..2536b13 100644
--- a/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
+++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
@@ -20,8 +20,8 @@
import android.media.AudioManager;
import android.os.Build;
import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
index cb482e8..e9077d8 100644
--- a/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
+++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
@@ -24,8 +24,8 @@
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.util.List;
import java.util.Set;
import org.appspot.apprtc.util.AppRTCUtils;
diff --git a/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java b/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
index b2aca95..5c73b43 100644
--- a/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
+++ b/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
@@ -16,8 +16,8 @@
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.os.Build;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import org.appspot.apprtc.util.AppRTCUtils;
import org.webrtc.ThreadUtils;
diff --git a/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
index 5293963..5d9d394 100644
--- a/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -24,7 +24,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
-import android.support.annotation.Nullable;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.View;
@@ -32,6 +31,7 @@
import android.view.WindowManager;
import android.view.WindowManager.LayoutParams;
import android.widget.Toast;
+import androidx.annotation.Nullable;
import java.io.IOException;
import java.lang.RuntimeException;
import java.util.ArrayList;
diff --git a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
index f282fc8..7206c88 100644
--- a/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
+++ b/examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
@@ -22,7 +22,6 @@
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;
@@ -38,6 +37,7 @@
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.TextView;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Random;
import org.json.JSONArray;
diff --git a/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java b/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
index 001728b..dd51ab2 100644
--- a/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
+++ b/examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
@@ -17,8 +17,8 @@
import android.os.BatteryManager;
import android.os.Build;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git a/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java b/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
index 023c2c2..1b113e1 100644
--- a/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
@@ -10,8 +10,8 @@
package org.appspot.apprtc;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index 533d178..d027f97 100644
--- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
@@ -13,8 +13,8 @@
import android.content.Context;
import android.os.Environment;
import android.os.ParcelFileDescriptor;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java b/examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java
index 06943f7..9787852 100644
--- a/examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java
+++ b/examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java
@@ -12,8 +12,8 @@
import android.media.AudioFormat;
import android.os.Environment;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
diff --git a/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java b/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
index d3094e7..d869d7c 100644
--- a/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
@@ -10,8 +10,8 @@
package org.appspot.apprtc;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java b/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
index af9a5f3..5fa4108 100644
--- a/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
@@ -11,8 +11,8 @@
package org.appspot.apprtc;
import android.os.Handler;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import de.tavendo.autobahn.WebSocket.WebSocketConnectionObserver;
import de.tavendo.autobahn.WebSocketConnection;
import de.tavendo.autobahn.WebSocketException;
diff --git a/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java b/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
index 13840c5..cbfdb21 100644
--- a/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
+++ b/examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
@@ -12,8 +12,8 @@
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import org.appspot.apprtc.RoomParametersFetcher.RoomParametersFetcherEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketChannelEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketConnectionState;
diff --git a/examples/androidnativeapi/BUILD.gn b/examples/androidnativeapi/BUILD.gn
index 9253c0b..1c840f8 100644
--- a/examples/androidnativeapi/BUILD.gn
+++ b/examples/androidnativeapi/BUILD.gn
@@ -21,7 +21,7 @@
"//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java",
"//sdk/android:video_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
shared_libraries = [ ":examples_androidnativeapi_jni" ]
diff --git a/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java b/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java
index 1fb1728..72fc0a6 100644
--- a/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java
+++ b/examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java
@@ -13,8 +13,8 @@
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.widget.Button;
+import androidx.annotation.Nullable;
import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator;
import org.webrtc.CameraEnumerator;
diff --git a/examples/unityplugin/java/src/org/webrtc/UnityUtility.java b/examples/unityplugin/java/src/org/webrtc/UnityUtility.java
index a8f53da..bd8bbfa 100644
--- a/examples/unityplugin/java/src/org/webrtc/UnityUtility.java
+++ b/examples/unityplugin/java/src/org/webrtc/UnityUtility.java
@@ -11,7 +11,7 @@
package org.webrtc;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
public class UnityUtility {
private static final String VIDEO_CAPTURER_THREAD_NAME = "VideoCapturerThread";
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 5d6a1d8..d441479 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -442,7 +442,7 @@
]
deps = [
"../../rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
}
diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
index 01e83ea..11ed669 100644
--- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
+++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
@@ -15,7 +15,7 @@
import android.media.audiofx.AudioEffect.Descriptor;
import android.media.audiofx.NoiseSuppressor;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.List;
import java.util.UUID;
import org.webrtc.Logging;
diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
index 2783a0d..b057c3a 100644
--- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
+++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
@@ -17,7 +17,7 @@
import android.media.AudioRecord;
import android.media.AudioTrack;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Timer;
import java.util.TimerTask;
import org.webrtc.ContextUtils;
diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
index fa188be..8eab01c 100644
--- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
+++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
@@ -15,7 +15,7 @@
import android.media.MediaRecorder.AudioSource;
import android.os.Build;
import android.os.Process;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.lang.System;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
index 95fd2e0..e3988e1 100644
--- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
+++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
@@ -18,7 +18,7 @@
import android.media.AudioTrack;
import android.os.Build;
import android.os.Process;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.lang.Thread;
import java.nio.ByteBuffer;
import org.webrtc.ContextUtils;
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 90bb8b7..05f3643 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1577,9 +1577,7 @@
"java/src/org/webrtc/Size.java",
"java/src/org/webrtc/ThreadUtils.java",
]
- deps = [
- "//third_party/android_deps:com_android_support_support_annotations_java",
- ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
java_cpp_enum("network_monitor_enums") {
sources = [ "network_monitor.h" ]
diff --git a/rtc_base/java/src/org/webrtc/Logging.java b/rtc_base/java/src/org/webrtc/Logging.java
index 788a3bb..e7a9921 100644
--- a/rtc_base/java/src/org/webrtc/Logging.java
+++ b/rtc_base/java/src/org/webrtc/Logging.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.EnumSet;
diff --git a/rtc_base/java/src/org/webrtc/ThreadUtils.java b/rtc_base/java/src/org/webrtc/ThreadUtils.java
index e2445a9..0c502b1 100644
--- a/rtc_base/java/src/org/webrtc/ThreadUtils.java
+++ b/rtc_base/java/src/org/webrtc/ThreadUtils.java
@@ -13,7 +13,7 @@
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 633f491..ec3454e 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -164,9 +164,7 @@
"src/java/org/webrtc/WebRtcClassLoader.java",
]
- deps = [
- "//third_party/android_deps:com_android_support_support_annotations_java",
- ]
+ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
rtc_android_library("audio_api_java") {
@@ -201,7 +199,6 @@
deps = [
":base_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [ "//api/video:video_frame_enums" ]
@@ -246,7 +243,7 @@
":base_java",
":video_api_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -320,7 +317,6 @@
":video_java",
"//modules/audio_device:audio_device_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
srcjar_deps = [
@@ -352,7 +348,7 @@
":video_api_java",
":video_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -368,7 +364,7 @@
":swcodecs_java",
":video_api_java",
":video_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -412,7 +408,7 @@
":video_api_java",
":video_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -433,7 +429,7 @@
":audio_api_java",
":base_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -455,7 +451,7 @@
":video_api_java",
":video_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
@@ -531,7 +527,7 @@
":video_api_java",
":video_java",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
]
}
}
@@ -1453,10 +1449,10 @@
":video_java",
"//base:base_java_test_support",
"//rtc_base:base_java",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_test_runner_java",
"//third_party/google-truth:google_truth_java",
"//third_party/hamcrest:hamcrest_java",
@@ -1634,8 +1630,8 @@
":video_api_java",
":video_java",
"//base:base_java_test_support",
- "//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:guava_android_java",
+ "//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/google-truth:google_truth_java",
]
diff --git a/sdk/android/api/org/webrtc/Camera1Enumerator.java b/sdk/android/api/org/webrtc/Camera1Enumerator.java
index 28b1046..fb1a21f 100644
--- a/sdk/android/api/org/webrtc/Camera1Enumerator.java
+++ b/sdk/android/api/org/webrtc/Camera1Enumerator.java
@@ -11,7 +11,7 @@
package org.webrtc;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
diff --git a/sdk/android/api/org/webrtc/Camera2Capturer.java b/sdk/android/api/org/webrtc/Camera2Capturer.java
index baf1e96..3c1d477 100644
--- a/sdk/android/api/org/webrtc/Camera2Capturer.java
+++ b/sdk/android/api/org/webrtc/Camera2Capturer.java
@@ -13,7 +13,7 @@
import android.annotation.TargetApi;
import android.content.Context;
import android.hardware.camera2.CameraManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
@TargetApi(21)
public class Camera2Capturer extends CameraCapturer {
diff --git a/sdk/android/api/org/webrtc/Camera2Enumerator.java b/sdk/android/api/org/webrtc/Camera2Enumerator.java
index 2c6bb57..8823c4c 100644
--- a/sdk/android/api/org/webrtc/Camera2Enumerator.java
+++ b/sdk/android/api/org/webrtc/Camera2Enumerator.java
@@ -20,9 +20,9 @@
import android.hardware.camera2.params.StreamConfigurationMap;
import android.os.Build;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
import android.util.AndroidException;
import android.util.Range;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java b/sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java
index 5fb9819..d7a8694 100644
--- a/sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.LinkedHashSet;
diff --git a/sdk/android/api/org/webrtc/DefaultVideoEncoderFactory.java b/sdk/android/api/org/webrtc/DefaultVideoEncoderFactory.java
index 029b415..76896b6 100644
--- a/sdk/android/api/org/webrtc/DefaultVideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/DefaultVideoEncoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.LinkedHashSet;
diff --git a/sdk/android/api/org/webrtc/EglBase.java b/sdk/android/api/org/webrtc/EglBase.java
index 38871b3..763f4e5 100644
--- a/sdk/android/api/org/webrtc/EglBase.java
+++ b/sdk/android/api/org/webrtc/EglBase.java
@@ -11,8 +11,8 @@
package org.webrtc;
import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import javax.microedition.khronos.egl.EGL10;
diff --git a/sdk/android/api/org/webrtc/EglRenderer.java b/sdk/android/api/org/webrtc/EglRenderer.java
index 106c9ad..5ab0868 100644
--- a/sdk/android/api/org/webrtc/EglRenderer.java
+++ b/sdk/android/api/org/webrtc/EglRenderer.java
@@ -18,8 +18,8 @@
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import java.text.DecimalFormat;
import java.util.ArrayList;
diff --git a/sdk/android/api/org/webrtc/EncodedImage.java b/sdk/android/api/org/webrtc/EncodedImage.java
index 84c420c..a6eef67 100644
--- a/sdk/android/api/org/webrtc/EncodedImage.java
+++ b/sdk/android/api/org/webrtc/EncodedImage.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit;
diff --git a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
index 2876df0..215598a 100644
--- a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
@@ -11,7 +11,7 @@
package org.webrtc;
import android.media.MediaCodecInfo;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
/** Factory for Android hardware VideoDecoders. */
diff --git a/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
index c9831c1..f2cde8f 100644
--- a/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
@@ -17,7 +17,7 @@
import android.media.MediaCodecInfo;
import android.media.MediaCodecList;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/IceCandidate.java b/sdk/android/api/org/webrtc/IceCandidate.java
index 03725cc..5f00b2a5 100644
--- a/sdk/android/api/org/webrtc/IceCandidate.java
+++ b/sdk/android/api/org/webrtc/IceCandidate.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import org.webrtc.PeerConnection;
diff --git a/sdk/android/api/org/webrtc/JavaI420Buffer.java b/sdk/android/api/org/webrtc/JavaI420Buffer.java
index 0deb38f..322b8f3 100644
--- a/sdk/android/api/org/webrtc/JavaI420Buffer.java
+++ b/sdk/android/api/org/webrtc/JavaI420Buffer.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import org.webrtc.VideoFrame.I420Buffer;
diff --git a/sdk/android/api/org/webrtc/MediaConstraints.java b/sdk/android/api/org/webrtc/MediaConstraints.java
index 28cf8d1..bae04e5 100644
--- a/sdk/android/api/org/webrtc/MediaConstraints.java
+++ b/sdk/android/api/org/webrtc/MediaConstraints.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/MediaStreamTrack.java b/sdk/android/api/org/webrtc/MediaStreamTrack.java
index 0249ffb..2e4c3e1 100644
--- a/sdk/android/api/org/webrtc/MediaStreamTrack.java
+++ b/sdk/android/api/org/webrtc/MediaStreamTrack.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/** Java wrapper for a C++ MediaStreamTrackInterface. */
public class MediaStreamTrack {
diff --git a/sdk/android/api/org/webrtc/NetworkChangeDetector.java b/sdk/android/api/org/webrtc/NetworkChangeDetector.java
index 65a78c4..856fe7d 100644
--- a/sdk/android/api/org/webrtc/NetworkChangeDetector.java
+++ b/sdk/android/api/org/webrtc/NetworkChangeDetector.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.List;
/** Interface for detecting network changes */
diff --git a/sdk/android/api/org/webrtc/NetworkMonitor.java b/sdk/android/api/org/webrtc/NetworkMonitor.java
index 566302b..9e14a2e 100644
--- a/sdk/android/api/org/webrtc/NetworkMonitor.java
+++ b/sdk/android/api/org/webrtc/NetworkMonitor.java
@@ -12,7 +12,7 @@
import android.content.Context;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import org.webrtc.NetworkChangeDetector;
diff --git a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
index 0573e49..2ecd7ce 100644
--- a/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
+++ b/sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
@@ -28,8 +28,8 @@
import android.net.wifi.p2p.WifiP2pGroup;
import android.net.wifi.p2p.WifiP2pManager;
import android.os.Build;
-import android.support.annotation.Nullable;
import android.telephony.TelephonyManager;
+import androidx.annotation.Nullable;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
diff --git a/sdk/android/api/org/webrtc/PeerConnection.java b/sdk/android/api/org/webrtc/PeerConnection.java
index ac259ae..67b551c 100644
--- a/sdk/android/api/org/webrtc/PeerConnection.java
+++ b/sdk/android/api/org/webrtc/PeerConnection.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/sdk/android/api/org/webrtc/PeerConnectionDependencies.java b/sdk/android/api/org/webrtc/PeerConnectionDependencies.java
index eb09168..ac6c94b 100644
--- a/sdk/android/api/org/webrtc/PeerConnectionDependencies.java
+++ b/sdk/android/api/org/webrtc/PeerConnectionDependencies.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* PeerConnectionDependencies holds all PeerConnection dependencies that are
diff --git a/sdk/android/api/org/webrtc/PeerConnectionFactory.java b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
index 1777ade..2b33c6c 100644
--- a/sdk/android/api/org/webrtc/PeerConnectionFactory.java
+++ b/sdk/android/api/org/webrtc/PeerConnectionFactory.java
@@ -12,7 +12,7 @@
import android.content.Context;
import android.os.Process;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.List;
import org.webrtc.Logging.Severity;
import org.webrtc.PeerConnection;
diff --git a/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
index d334dfa..caca5e5 100644
--- a/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
@@ -11,7 +11,7 @@
package org.webrtc;
import android.media.MediaCodecInfo;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
/** Factory for Android platform software VideoDecoders. */
diff --git a/sdk/android/api/org/webrtc/RtpParameters.java b/sdk/android/api/org/webrtc/RtpParameters.java
index 673ef47..9ca8311 100644
--- a/sdk/android/api/org/webrtc/RtpParameters.java
+++ b/sdk/android/api/org/webrtc/RtpParameters.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.lang.Double;
import java.lang.String;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/RtpReceiver.java b/sdk/android/api/org/webrtc/RtpReceiver.java
index 015d35a..a5710f9 100644
--- a/sdk/android/api/org/webrtc/RtpReceiver.java
+++ b/sdk/android/api/org/webrtc/RtpReceiver.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.webrtc.MediaStreamTrack;
/** Java wrapper for a C++ RtpReceiverInterface. */
diff --git a/sdk/android/api/org/webrtc/RtpSender.java b/sdk/android/api/org/webrtc/RtpSender.java
index 7018c57..b78bbf6 100644
--- a/sdk/android/api/org/webrtc/RtpSender.java
+++ b/sdk/android/api/org/webrtc/RtpSender.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.List;
/** Java wrapper for a C++ RtpSenderInterface. */
diff --git a/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java b/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
index e37b34d..adcb114 100644
--- a/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
+++ b/sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
@@ -18,8 +18,8 @@
import android.hardware.display.VirtualDisplay;
import android.media.projection.MediaProjection;
import android.media.projection.MediaProjectionManager;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
/**
* An implementation of VideoCapturer to capture the screen content as a video stream.
diff --git a/sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
index c59db3b..e767aee 100644
--- a/sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
index 4de39dc..6074be2 100644
--- a/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
diff --git a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
index 085576b..e186f9a 100644
--- a/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
+++ b/sdk/android/api/org/webrtc/SurfaceTextureHelper.java
@@ -17,7 +17,7 @@
import android.os.Build;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.concurrent.Callable;
import org.webrtc.EglBase.Context;
import org.webrtc.TextureBufferImpl.RefCountMonitor;
diff --git a/sdk/android/api/org/webrtc/TextureBufferImpl.java b/sdk/android/api/org/webrtc/TextureBufferImpl.java
index 8d75216..31d0456 100644
--- a/sdk/android/api/org/webrtc/TextureBufferImpl.java
+++ b/sdk/android/api/org/webrtc/TextureBufferImpl.java
@@ -12,7 +12,7 @@
import android.graphics.Matrix;
import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Android texture buffer that glues together the necessary information together with a generic
diff --git a/sdk/android/api/org/webrtc/VideoCodecInfo.java b/sdk/android/api/org/webrtc/VideoCodecInfo.java
index e11782d..4f97cf7 100644
--- a/sdk/android/api/org/webrtc/VideoCodecInfo.java
+++ b/sdk/android/api/org/webrtc/VideoCodecInfo.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.Locale;
import java.util.Map;
diff --git a/sdk/android/api/org/webrtc/VideoDecoderFactory.java b/sdk/android/api/org/webrtc/VideoDecoderFactory.java
index 3f0168f..8b25516 100644
--- a/sdk/android/api/org/webrtc/VideoDecoderFactory.java
+++ b/sdk/android/api/org/webrtc/VideoDecoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/** Factory for creating VideoDecoders. */
public interface VideoDecoderFactory {
diff --git a/sdk/android/api/org/webrtc/VideoEncoder.java b/sdk/android/api/org/webrtc/VideoEncoder.java
index cd897d0..89a9bfd 100644
--- a/sdk/android/api/org/webrtc/VideoEncoder.java
+++ b/sdk/android/api/org/webrtc/VideoEncoder.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.webrtc.EncodedImage;
/**
diff --git a/sdk/android/api/org/webrtc/VideoEncoderFactory.java b/sdk/android/api/org/webrtc/VideoEncoderFactory.java
index 050aa71..e69e967 100644
--- a/sdk/android/api/org/webrtc/VideoEncoderFactory.java
+++ b/sdk/android/api/org/webrtc/VideoEncoderFactory.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/** Factory for creating VideoEncoders. */
public interface VideoEncoderFactory {
diff --git a/sdk/android/api/org/webrtc/VideoFrameDrawer.java b/sdk/android/api/org/webrtc/VideoFrameDrawer.java
index cb4bb01..af32587 100644
--- a/sdk/android/api/org/webrtc/VideoFrameDrawer.java
+++ b/sdk/android/api/org/webrtc/VideoFrameDrawer.java
@@ -13,7 +13,7 @@
import android.graphics.Matrix;
import android.graphics.Point;
import android.opengl.GLES20;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
/**
diff --git a/sdk/android/api/org/webrtc/VideoProcessor.java b/sdk/android/api/org/webrtc/VideoProcessor.java
index 19a2b38..c39a55c 100644
--- a/sdk/android/api/org/webrtc/VideoProcessor.java
+++ b/sdk/android/api/org/webrtc/VideoProcessor.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Lightweight abstraction for an object that can receive video frames, process them, and pass them
diff --git a/sdk/android/api/org/webrtc/VideoSource.java b/sdk/android/api/org/webrtc/VideoSource.java
index b0bffd6..2e22d1a 100644
--- a/sdk/android/api/org/webrtc/VideoSource.java
+++ b/sdk/android/api/org/webrtc/VideoSource.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
/**
* Java wrapper of native AndroidVideoTrackSource.
diff --git a/sdk/android/api/org/webrtc/YuvConverter.java b/sdk/android/api/org/webrtc/YuvConverter.java
index 10b9cc1..ab9688a 100644
--- a/sdk/android/api/org/webrtc/YuvConverter.java
+++ b/sdk/android/api/org/webrtc/YuvConverter.java
@@ -13,7 +13,7 @@
import android.graphics.Matrix;
import android.opengl.GLES20;
import android.opengl.GLException;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import org.webrtc.VideoFrame.I420Buffer;
import org.webrtc.VideoFrame.TextureBuffer;
diff --git a/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java b/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java
index 4ca6466..ae5858a 100644
--- a/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java
+++ b/sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java
@@ -15,7 +15,7 @@
import android.media.AudioDeviceInfo;
import android.media.AudioManager;
import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
import java.util.concurrent.ScheduledExecutorService;
import org.webrtc.JniCommon;
import org.webrtc.Logging;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java b/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java
index 5b71370..3c9e0f7 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java
@@ -13,7 +13,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
index c358dc0..5a09795 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
@@ -19,8 +19,8 @@
import android.hardware.camera2.CameraManager;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
+import androidx.annotation.Nullable;
import androidx.test.filters.LargeTest;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
index e32e67b..aa5fb0c 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
@@ -16,7 +16,7 @@
import static org.junit.Assert.fail;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
index 2a1af66..4ec0d94 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
@@ -12,7 +12,7 @@
import static org.junit.Assert.assertEquals;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
index a9f10c5..1542a39 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
@@ -18,8 +18,8 @@
import android.annotation.TargetApi;
import android.graphics.Matrix;
import android.opengl.GLES11Ext;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest;
import java.nio.ByteBuffer;
import java.util.ArrayList;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
index b1b466c..b9d1a01 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
@@ -24,10 +24,10 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest;
import android.support.test.rule.UiThreadTestRule;
+import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest;
import java.util.List;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
index 72b7e44..cc09322 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
@@ -17,8 +17,8 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
+import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest;
import java.lang.ref.WeakReference;
diff --git a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
index 99ccc1e..3964d22 100644
--- a/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
+++ b/sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
@@ -16,7 +16,7 @@
import android.opengl.GLES20;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest;
import java.nio.ByteBuffer;
diff --git a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
index f392f8c..651774e 100644
--- a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
+++ b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
@@ -14,8 +14,8 @@
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaFormat;
import android.os.SystemClock;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingDeque;
diff --git a/sdk/android/src/java/org/webrtc/Camera2Session.java b/sdk/android/src/java/org/webrtc/Camera2Session.java
index cb7c09d..63eabe9 100644
--- a/sdk/android/src/java/org/webrtc/Camera2Session.java
+++ b/sdk/android/src/java/org/webrtc/Camera2Session.java
@@ -21,9 +21,9 @@
import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest;
import android.os.Handler;
-import android.support.annotation.Nullable;
import android.util.Range;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
diff --git a/sdk/android/src/java/org/webrtc/CameraCapturer.java b/sdk/android/src/java/org/webrtc/CameraCapturer.java
index 47519d765..1922a52 100644
--- a/sdk/android/src/java/org/webrtc/CameraCapturer.java
+++ b/sdk/android/src/java/org/webrtc/CameraCapturer.java
@@ -13,7 +13,7 @@
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
diff --git a/sdk/android/src/java/org/webrtc/EglBase10Impl.java b/sdk/android/src/java/org/webrtc/EglBase10Impl.java
index 1affbd9..14b9141 100644
--- a/sdk/android/src/java/org/webrtc/EglBase10Impl.java
+++ b/sdk/android/src/java/org/webrtc/EglBase10Impl.java
@@ -13,9 +13,9 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
-import android.support.annotation.Nullable;
import android.view.Surface;
import android.view.SurfaceHolder;
+import androidx.annotation.Nullable;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;
diff --git a/sdk/android/src/java/org/webrtc/EglBase14Impl.java b/sdk/android/src/java/org/webrtc/EglBase14Impl.java
index a3b8a78..3e319ba 100644
--- a/sdk/android/src/java/org/webrtc/EglBase14Impl.java
+++ b/sdk/android/src/java/org/webrtc/EglBase14Impl.java
@@ -19,8 +19,8 @@
import android.opengl.EGLExt;
import android.opengl.EGLSurface;
import android.os.Build;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import org.webrtc.EglBase;
/**
diff --git a/sdk/android/src/java/org/webrtc/GlGenericDrawer.java b/sdk/android/src/java/org/webrtc/GlGenericDrawer.java
index 0e9718e..b70a372 100644
--- a/sdk/android/src/java/org/webrtc/GlGenericDrawer.java
+++ b/sdk/android/src/java/org/webrtc/GlGenericDrawer.java
@@ -12,7 +12,7 @@
import android.opengl.GLES11Ext;
import android.opengl.GLES20;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.FloatBuffer;
import org.webrtc.GlShader;
import org.webrtc.GlUtil;
diff --git a/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java b/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
index 7119ed2..5c2721a 100644
--- a/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
+++ b/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
@@ -16,8 +16,8 @@
import android.media.MediaFormat;
import android.opengl.GLES20;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Map;
diff --git a/sdk/android/src/java/org/webrtc/MediaCodecUtils.java b/sdk/android/src/java/org/webrtc/MediaCodecUtils.java
index b634fb3..5d83014 100644
--- a/sdk/android/src/java/org/webrtc/MediaCodecUtils.java
+++ b/sdk/android/src/java/org/webrtc/MediaCodecUtils.java
@@ -14,7 +14,7 @@
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
diff --git a/sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java b/sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
index 5a1d63e..9410c4c 100644
--- a/sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
+++ b/sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
@@ -17,7 +17,7 @@
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaCodecList;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
diff --git a/sdk/android/src/java/org/webrtc/NV12Buffer.java b/sdk/android/src/java/org/webrtc/NV12Buffer.java
index 79f6f72..fe0221d 100644
--- a/sdk/android/src/java/org/webrtc/NV12Buffer.java
+++ b/sdk/android/src/java/org/webrtc/NV12Buffer.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
public class NV12Buffer implements VideoFrame.Buffer {
diff --git a/sdk/android/src/java/org/webrtc/NV21Buffer.java b/sdk/android/src/java/org/webrtc/NV21Buffer.java
index 76e6e17..0fb1afe 100644
--- a/sdk/android/src/java/org/webrtc/NV21Buffer.java
+++ b/sdk/android/src/java/org/webrtc/NV21Buffer.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
public class NV21Buffer implements VideoFrame.Buffer {
diff --git a/sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java b/sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java
index cdc9b53..d4fba48 100644
--- a/sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java
+++ b/sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.webrtc.VideoFrame;
import org.webrtc.VideoProcessor;
diff --git a/sdk/android/src/java/org/webrtc/RefCountDelegate.java b/sdk/android/src/java/org/webrtc/RefCountDelegate.java
index acbc0c3..b9210d2 100644
--- a/sdk/android/src/java/org/webrtc/RefCountDelegate.java
+++ b/sdk/android/src/java/org/webrtc/RefCountDelegate.java
@@ -10,7 +10,7 @@
package org.webrtc;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.concurrent.atomic.AtomicInteger;
/**
diff --git a/sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java b/sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java
index 945e058..b5485d4 100644
--- a/sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java
+++ b/sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java
@@ -11,7 +11,7 @@
package org.webrtc;
// Explicit imports necessary for JNI generation.
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import org.webrtc.VideoEncoder;
/**
diff --git a/sdk/android/src/java/org/webrtc/audio/VolumeLogger.java b/sdk/android/src/java/org/webrtc/audio/VolumeLogger.java
index 5d95007..06d5cd3 100644
--- a/sdk/android/src/java/org/webrtc/audio/VolumeLogger.java
+++ b/sdk/android/src/java/org/webrtc/audio/VolumeLogger.java
@@ -11,7 +11,7 @@
package org.webrtc.audio;
import android.media.AudioManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.Timer;
import java.util.TimerTask;
import org.webrtc.Logging;
diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
index 7444df3..fb132c6 100644
--- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
+++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
@@ -15,7 +15,7 @@
import android.media.audiofx.AudioEffect.Descriptor;
import android.media.audiofx.NoiseSuppressor;
import android.os.Build;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.util.UUID;
import org.webrtc.Logging;
diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
index dbbcdef..10fd58c 100644
--- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
+++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
@@ -20,8 +20,8 @@
import android.media.MediaRecorder.AudioSource;
import android.os.Build;
import android.os.Process;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import java.lang.System;
import java.nio.ByteBuffer;
import java.util.Arrays;
diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java
index 2447fbce..885df55 100644
--- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java
+++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java
@@ -18,7 +18,7 @@
import android.media.AudioTrack;
import android.os.Build;
import android.os.Process;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import org.webrtc.CalledByNative;
import org.webrtc.Logging;
diff --git a/sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java b/sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java
index 3625faa..990f7b3 100644
--- a/sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java
+++ b/sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java
@@ -16,8 +16,8 @@
import android.media.MediaCrypto;
import android.media.MediaFormat;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import android.view.Surface;
+import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
