mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-18 08:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace the android support annotation library with androidx's one.

Browse source 
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}
This commit is contained in:
Byoungchan Lee 2021-08-14 11:41:59 +09:00 committed by WebRTC LUCI CQ
parent e9716de2cd
commit 02334e07c5
92 changed files with 108 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/BUILD.gn
View file

@ -150,7 +150,7 @@ if (is_android) {
"../sdk/android:video_api_java", "../sdk/android:video_api_java",
"../sdk/android:video_java", "../sdk/android:video_java",
"androidapp/third_party/autobanh:autobanh_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 @@ if (is_android) {
"../sdk/android:peerconnection_java", "../sdk/android:peerconnection_java",
"../sdk/android:video_api_java", "../sdk/android:video_api_java",
"../sdk/android:video_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 @@ if (is_android) {
"../rtc_base:base_java", "../rtc_base:base_java",
"../sdk/android:libjingle_peerconnection_java", "../sdk/android:libjingle_peerconnection_java",
"../sdk/android:libjingle_peerconnection_metrics_default_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",
] ]
} }

2
examples/aarproject/app/build.gradle
View file

@ -46,7 +46,7 @@ dependencies {
implementation fileTree(dir: project.aarDir, include: ['google-webrtc-*.aar']) implementation fileTree(dir: project.aarDir, include: ['google-webrtc-*.aar'])
} }
implementation fileTree(dir: '../../androidapp/third_party/autobanh/lib', include: ['autobanh.jar']) 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' testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

5
examples/aarproject/gradle.properties
View file

@ -15,3 +15,8 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit # 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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # 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

2
examples/androidapp/src/org/appspot/apprtc/AppRTCAudioManager.java
View file

@ -20,8 +20,8 @@ import android.media.AudioDeviceInfo;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

2
examples/androidapp/src/org/appspot/apprtc/AppRTCBluetoothManager.java
View file

@ -24,8 +24,8 @@ import android.media.AudioManager;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.appspot.apprtc.util.AppRTCUtils; import org.appspot.apprtc.util.AppRTCUtils;

2
examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java
View file

@ -16,8 +16,8 @@ import android.hardware.SensorEvent;
import android.hardware.SensorEventListener; import android.hardware.SensorEventListener;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import org.appspot.apprtc.util.AppRTCUtils; import org.appspot.apprtc.util.AppRTCUtils;
import org.webrtc.ThreadUtils; import org.webrtc.ThreadUtils;

2
examples/androidapp/src/org/appspot/apprtc/CallActivity.java
View file

@ -24,7 +24,6 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
@ -32,6 +31,7 @@ import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowManager.LayoutParams; import android.view.WindowManager.LayoutParams;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.lang.RuntimeException; import java.lang.RuntimeException;
import java.util.ArrayList; import java.util.ArrayList;

2
examples/androidapp/src/org/appspot/apprtc/ConnectActivity.java
View file

@ -22,7 +22,6 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.KeyEvent; import android.view.KeyEvent;
@ -38,6 +37,7 @@ import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import org.json.JSONArray; import org.json.JSONArray;

2
examples/androidapp/src/org/appspot/apprtc/CpuMonitor.java
View file

@ -17,8 +17,8 @@ import android.content.IntentFilter;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;

2
examples/androidapp/src/org/appspot/apprtc/DirectRTCClient.java
View file

@ -10,8 +10,8 @@
package org.appspot.apprtc; package org.appspot.apprtc;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;

2
examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View file

@ -13,8 +13,8 @@ package org.appspot.apprtc;
import android.content.Context; import android.content.Context;
import android.os.Environment; import android.os.Environment;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

2
examples/androidapp/src/org/appspot/apprtc/RecordedAudioToFileController.java
View file

@ -12,8 +12,8 @@ package org.appspot.apprtc;
import android.media.AudioFormat; import android.media.AudioFormat;
import android.os.Environment; import android.os.Environment;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;

2
examples/androidapp/src/org/appspot/apprtc/TCPChannelClient.java
View file

@ -10,8 +10,8 @@
package org.appspot.apprtc; package org.appspot.apprtc;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;

2
examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java
View file

@ -11,8 +11,8 @@
package org.appspot.apprtc; package org.appspot.apprtc;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import de.tavendo.autobahn.WebSocket.WebSocketConnectionObserver; import de.tavendo.autobahn.WebSocket.WebSocketConnectionObserver;
import de.tavendo.autobahn.WebSocketConnection; import de.tavendo.autobahn.WebSocketConnection;
import de.tavendo.autobahn.WebSocketException; import de.tavendo.autobahn.WebSocketException;

2
examples/androidapp/src/org/appspot/apprtc/WebSocketRTCClient.java
View file

@ -12,8 +12,8 @@ package org.appspot.apprtc;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import org.appspot.apprtc.RoomParametersFetcher.RoomParametersFetcherEvents; import org.appspot.apprtc.RoomParametersFetcher.RoomParametersFetcherEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketChannelEvents; import org.appspot.apprtc.WebSocketChannelClient.WebSocketChannelEvents;
import org.appspot.apprtc.WebSocketChannelClient.WebSocketConnectionState; import org.appspot.apprtc.WebSocketChannelClient.WebSocketConnectionState;

2
examples/androidnativeapi/BUILD.gn
View file

@ -21,7 +21,7 @@ if (is_android) {
"//sdk/android:surfaceviewrenderer_java", "//sdk/android:surfaceviewrenderer_java",
"//sdk/android:video_api_java", "//sdk/android:video_api_java",
"//sdk/android:video_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" ] shared_libraries = [ ":examples_androidnativeapi_jni" ]

2
examples/androidnativeapi/java/org/webrtc/examples/androidnativeapi/MainActivity.java
View file

@ -13,8 +13,8 @@ package org.webrtc.examples.androidnativeapi;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.widget.Button; import android.widget.Button;
import androidx.annotation.Nullable;
import org.webrtc.Camera1Enumerator; import org.webrtc.Camera1Enumerator;
import org.webrtc.Camera2Enumerator; import org.webrtc.Camera2Enumerator;
import org.webrtc.CameraEnumerator; import org.webrtc.CameraEnumerator;

2
examples/unityplugin/java/src/org/webrtc/UnityUtility.java
View file

@ -11,7 +11,7 @@
package org.webrtc; package org.webrtc;
import android.content.Context; import android.content.Context;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
public class UnityUtility { public class UnityUtility {
private static final String VIDEO_CAPTURER_THREAD_NAME = "VideoCapturerThread"; private static final String VIDEO_CAPTURER_THREAD_NAME = "VideoCapturerThread";

2
modules/audio_device/BUILD.gn
View file

@ -442,7 +442,7 @@ if (!build_with_chromium && is_android) {
] ]
deps = [ deps = [
"../../rtc_base:base_java", "../../rtc_base:base_java",
"//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/androidx:androidx_annotation_annotation_java",
] ]
} }
} }

2
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java
View file

@ -15,7 +15,7 @@ import android.media.audiofx.AudioEffect;
import android.media.audiofx.AudioEffect.Descriptor; import android.media.audiofx.AudioEffect.Descriptor;
import android.media.audiofx.NoiseSuppressor; import android.media.audiofx.NoiseSuppressor;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import org.webrtc.Logging; import org.webrtc.Logging;

2
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
View file

@ -17,7 +17,7 @@ import android.media.AudioManager;
import android.media.AudioRecord; import android.media.AudioRecord;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import org.webrtc.ContextUtils; import org.webrtc.ContextUtils;

2
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
View file

@ -15,7 +15,7 @@ import android.media.AudioRecord;
import android.media.MediaRecorder.AudioSource; import android.media.MediaRecorder.AudioSource;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.System; import java.lang.System;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;

2
modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java
View file

@ -18,7 +18,7 @@ import android.media.AudioManager;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.Thread; import java.lang.Thread;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.webrtc.ContextUtils; import org.webrtc.ContextUtils;

4
rtc_base/BUILD.gn
View file

@ -1577,9 +1577,7 @@ if (is_android) {
"java/src/org/webrtc/Size.java", "java/src/org/webrtc/Size.java",
"java/src/org/webrtc/ThreadUtils.java", "java/src/org/webrtc/ThreadUtils.java",
] ]
deps = [ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
"//third_party/android_deps:com_android_support_support_annotations_java",
]
} }
java_cpp_enum("network_monitor_enums") { java_cpp_enum("network_monitor_enums") {
sources = [ "network_monitor.h" ] sources = [ "network_monitor.h" ]

2
rtc_base/java/src/org/webrtc/Logging.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.EnumSet; import java.util.EnumSet;

2
rtc_base/java/src/org/webrtc/ThreadUtils.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

24
sdk/android/BUILD.gn
View file

@ -164,9 +164,7 @@ if (is_android) {
"src/java/org/webrtc/WebRtcClassLoader.java", "src/java/org/webrtc/WebRtcClassLoader.java",
] ]
deps = [ deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
"//third_party/android_deps:com_android_support_support_annotations_java",
]
} }
rtc_android_library("audio_api_java") { rtc_android_library("audio_api_java") {
@ -201,7 +199,6 @@ if (is_android) {
deps = [ deps = [
":base_java", ":base_java",
"//rtc_base:base_java", "//rtc_base:base_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_annotation_annotation_java",
] ]
srcjar_deps = [ "//api/video:video_frame_enums" ] srcjar_deps = [ "//api/video:video_frame_enums" ]
@ -246,7 +243,7 @@ if (is_android) {
":base_java", ":base_java",
":video_api_java", ":video_api_java",
"//rtc_base:base_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 @@ if (is_android) {
":video_java", ":video_java",
"//modules/audio_device:audio_device_java", "//modules/audio_device:audio_device_java",
"//rtc_base:base_java", "//rtc_base:base_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/androidx:androidx_annotation_annotation_java", "//third_party/androidx:androidx_annotation_annotation_java",
] ]
srcjar_deps = [ srcjar_deps = [
@ -352,7 +348,7 @@ if (is_android) {
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//rtc_base:base_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 @@ if (is_android) {
":swcodecs_java", ":swcodecs_java",
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//third_party/android_deps:com_android_support_support_annotations_java", "//third_party/androidx:androidx_annotation_annotation_java",
] ]
} }
@ -412,7 +408,7 @@ if (is_android) {
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//rtc_base:base_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 @@ if (is_android) {
":audio_api_java", ":audio_api_java",
":base_java", ":base_java",
"//rtc_base: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 @@ if (is_android) {
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//rtc_base:base_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 @@ if (is_android) {
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//rtc_base:base_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 @@ if (is_android) {
":video_java", ":video_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//rtc_base:base_java", "//rtc_base:base_java",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:guava_android_java", "//third_party/android_deps:guava_android_java",
"//third_party/android_support_test_runner:rules_java", "//third_party/android_support_test_runner:rules_java",
"//third_party/android_support_test_runner:runner_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/androidx:androidx_test_runner_java",
"//third_party/google-truth:google_truth_java", "//third_party/google-truth:google_truth_java",
"//third_party/hamcrest:hamcrest_java", "//third_party/hamcrest:hamcrest_java",
@ -1634,8 +1630,8 @@ if (is_android) {
":video_api_java", ":video_api_java",
":video_java", ":video_java",
"//base:base_java_test_support", "//base:base_java_test_support",
"//third_party/android_deps:com_android_support_support_annotations_java",
"//third_party/android_deps:guava_android_java", "//third_party/android_deps:guava_android_java",
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/google-truth:google_truth_java", "//third_party/google-truth:google_truth_java",
] ]

2
sdk/android/api/org/webrtc/Camera1Enumerator.java
View file

@ -11,7 +11,7 @@
package org.webrtc; package org.webrtc;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.webrtc.CameraEnumerationAndroid.CaptureFormat; import org.webrtc.CameraEnumerationAndroid.CaptureFormat;

2
sdk/android/api/org/webrtc/Camera2Capturer.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.Context; import android.content.Context;
import android.hardware.camera2.CameraManager; import android.hardware.camera2.CameraManager;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
@TargetApi(21) @TargetApi(21)
public class Camera2Capturer extends CameraCapturer { public class Camera2Capturer extends CameraCapturer {

2
sdk/android/api/org/webrtc/Camera2Enumerator.java
View file

@ -20,9 +20,9 @@ import android.hardware.camera2.CameraMetadata;
import android.hardware.camera2.params.StreamConfigurationMap; import android.hardware.camera2.params.StreamConfigurationMap;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.util.AndroidException; import android.util.AndroidException;
import android.util.Range; import android.util.Range;
import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/DefaultVideoDecoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;

2
sdk/android/api/org/webrtc/DefaultVideoEncoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;

2
sdk/android/api/org/webrtc/EglBase.java
View file

@ -11,8 +11,8 @@
package org.webrtc; package org.webrtc;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL10;

2
sdk/android/api/org/webrtc/EglRenderer.java
View file

@ -18,8 +18,8 @@ import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;

2
sdk/android/api/org/webrtc/EncodedImage.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

2
sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java
View file

@ -11,7 +11,7 @@
package org.webrtc; package org.webrtc;
import android.media.MediaCodecInfo; import android.media.MediaCodecInfo;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
/** Factory for Android hardware VideoDecoders. */ /** Factory for Android hardware VideoDecoders. */

2
sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java
View file

@ -17,7 +17,7 @@ import static org.webrtc.MediaCodecUtils.QCOM_PREFIX;
import android.media.MediaCodecInfo; import android.media.MediaCodecInfo;
import android.media.MediaCodecList; import android.media.MediaCodecList;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/IceCandidate.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import org.webrtc.PeerConnection; import org.webrtc.PeerConnection;

2
sdk/android/api/org/webrtc/JavaI420Buffer.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.webrtc.VideoFrame.I420Buffer; import org.webrtc.VideoFrame.I420Buffer;

2
sdk/android/api/org/webrtc/MediaConstraints.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/MediaStreamTrack.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** Java wrapper for a C++ MediaStreamTrackInterface. */ /** Java wrapper for a C++ MediaStreamTrackInterface. */
public class MediaStreamTrack { public class MediaStreamTrack {

2
sdk/android/api/org/webrtc/NetworkChangeDetector.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.List; import java.util.List;
/** Interface for detecting network changes */ /** Interface for detecting network changes */

2
sdk/android/api/org/webrtc/NetworkMonitor.java
View file

@ -12,7 +12,7 @@ package org.webrtc;
import android.content.Context; import android.content.Context;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.webrtc.NetworkChangeDetector; import org.webrtc.NetworkChangeDetector;

2
sdk/android/api/org/webrtc/NetworkMonitorAutoDetect.java
View file

@ -28,8 +28,8 @@ import android.net.wifi.WifiManager;
import android.net.wifi.p2p.WifiP2pGroup; import android.net.wifi.p2p.WifiP2pGroup;
import android.net.wifi.p2p.WifiP2pManager; import android.net.wifi.p2p.WifiP2pManager;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import androidx.annotation.Nullable;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.SocketException; import java.net.SocketException;

2
sdk/android/api/org/webrtc/PeerConnection.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

2
sdk/android/api/org/webrtc/PeerConnectionDependencies.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** /**
* PeerConnectionDependencies holds all PeerConnection dependencies that are * PeerConnectionDependencies holds all PeerConnection dependencies that are

2
sdk/android/api/org/webrtc/PeerConnectionFactory.java
View file

@ -12,7 +12,7 @@ package org.webrtc;
import android.content.Context; import android.content.Context;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.List; import java.util.List;
import org.webrtc.Logging.Severity; import org.webrtc.Logging.Severity;
import org.webrtc.PeerConnection; import org.webrtc.PeerConnection;

2
sdk/android/api/org/webrtc/PlatformSoftwareVideoDecoderFactory.java
View file

@ -11,7 +11,7 @@
package org.webrtc; package org.webrtc;
import android.media.MediaCodecInfo; import android.media.MediaCodecInfo;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
/** Factory for Android platform software VideoDecoders. */ /** Factory for Android platform software VideoDecoders. */

2
sdk/android/api/org/webrtc/RtpParameters.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.lang.Double; import java.lang.Double;
import java.lang.String; import java.lang.String;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/RtpReceiver.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import org.webrtc.MediaStreamTrack; import org.webrtc.MediaStreamTrack;
/** Java wrapper for a C++ RtpReceiverInterface. */ /** Java wrapper for a C++ RtpReceiverInterface. */

2
sdk/android/api/org/webrtc/RtpSender.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.List; import java.util.List;
/** Java wrapper for a C++ RtpSenderInterface. */ /** Java wrapper for a C++ RtpSenderInterface. */

2
sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
View file

@ -18,8 +18,8 @@ import android.hardware.display.DisplayManager;
import android.hardware.display.VirtualDisplay; import android.hardware.display.VirtualDisplay;
import android.media.projection.MediaProjection; import android.media.projection.MediaProjection;
import android.media.projection.MediaProjectionManager; import android.media.projection.MediaProjectionManager;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
/** /**
* An implementation of VideoCapturer to capture the screen content as a video stream. * An implementation of VideoCapturer to capture the screen content as a video stream.

2
sdk/android/api/org/webrtc/SoftwareVideoDecoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/SoftwareVideoEncoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
sdk/android/api/org/webrtc/SurfaceTextureHelper.java
View file

@ -17,7 +17,7 @@ import android.opengl.GLES20;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.webrtc.EglBase.Context; import org.webrtc.EglBase.Context;
import org.webrtc.TextureBufferImpl.RefCountMonitor; import org.webrtc.TextureBufferImpl.RefCountMonitor;

2
sdk/android/api/org/webrtc/TextureBufferImpl.java
View file

@ -12,7 +12,7 @@ package org.webrtc;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.os.Handler; 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 * Android texture buffer that glues together the necessary information together with a generic

2
sdk/android/api/org/webrtc/VideoCodecInfo.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;

2
sdk/android/api/org/webrtc/VideoDecoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** Factory for creating VideoDecoders. */ /** Factory for creating VideoDecoders. */
public interface VideoDecoderFactory { public interface VideoDecoderFactory {

2
sdk/android/api/org/webrtc/VideoEncoder.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import org.webrtc.EncodedImage; import org.webrtc.EncodedImage;
/** /**

2
sdk/android/api/org/webrtc/VideoEncoderFactory.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** Factory for creating VideoEncoders. */ /** Factory for creating VideoEncoders. */
public interface VideoEncoderFactory { public interface VideoEncoderFactory {

2
sdk/android/api/org/webrtc/VideoFrameDrawer.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Point; import android.graphics.Point;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
/** /**

2
sdk/android/api/org/webrtc/VideoProcessor.java
View file

@ -10,7 +10,7 @@
package org.webrtc; 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 * Lightweight abstraction for an object that can receive video frames, process them, and pass them

2
sdk/android/api/org/webrtc/VideoSource.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** /**
* Java wrapper of native AndroidVideoTrackSource. * Java wrapper of native AndroidVideoTrackSource.

2
sdk/android/api/org/webrtc/YuvConverter.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.opengl.GLException; import android.opengl.GLException;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.webrtc.VideoFrame.I420Buffer; import org.webrtc.VideoFrame.I420Buffer;
import org.webrtc.VideoFrame.TextureBuffer; import org.webrtc.VideoFrame.TextureBuffer;

2
sdk/android/api/org/webrtc/audio/JavaAudioDeviceModule.java
View file

@ -15,7 +15,7 @@ import android.media.AudioAttributes;
import android.media.AudioDeviceInfo; import android.media.AudioDeviceInfo;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build; import android.os.Build;
import android.support.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import org.webrtc.JniCommon; import org.webrtc.JniCommon;
import org.webrtc.Logging; import org.webrtc.Logging;

2
sdk/android/instrumentationtests/src/org/webrtc/AndroidVideoDecoderInstrumentationTest.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
sdk/android/instrumentationtests/src/org/webrtc/Camera2CapturerTest.java
View file

@ -19,8 +19,8 @@ import android.hardware.camera2.CameraDevice;
import android.hardware.camera2.CameraManager; import android.hardware.camera2.CameraManager;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import androidx.annotation.Nullable;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;

2
sdk/android/instrumentationtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
View file

@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.content.Context; import android.content.Context;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;

2
sdk/android/instrumentationtests/src/org/webrtc/DefaultVideoEncoderFactoryTest.java
View file

@ -12,7 +12,7 @@ package org.webrtc;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;

2
sdk/android/instrumentationtests/src/org/webrtc/HardwareVideoEncoderTest.java
View file

@ -18,8 +18,8 @@ import static org.junit.Assert.fail;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.opengl.GLES11Ext; import android.opengl.GLES11Ext;
import android.support.annotation.Nullable;
import android.util.Log; import android.util.Log;
import androidx.annotation.Nullable;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;

2
sdk/android/instrumentationtests/src/org/webrtc/NetworkMonitorTest.java
View file

@ -24,10 +24,10 @@ import android.net.Network;
import android.os.Build; import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import android.support.test.annotation.UiThreadTest; import android.support.test.annotation.UiThreadTest;
import android.support.test.rule.UiThreadTestRule; import android.support.test.rule.UiThreadTestRule;
import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.util.List; import java.util.List;

2
sdk/android/instrumentationtests/src/org/webrtc/PeerConnectionEndToEndTest.java
View file

@ -17,8 +17,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry; import android.support.test.InstrumentationRegistry;
import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;

2
sdk/android/instrumentationtests/src/org/webrtc/SurfaceTextureHelperTest.java
View file

@ -16,7 +16,7 @@ import static org.junit.Assert.fail;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.test.filters.MediumTest; import androidx.test.filters.MediumTest;
import androidx.test.filters.SmallTest; import androidx.test.filters.SmallTest;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;

2
sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
View file

@ -14,8 +14,8 @@ import android.media.MediaCodec;
import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaFormat; import android.media.MediaFormat;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.concurrent.BlockingDeque; import java.util.concurrent.BlockingDeque;

2
sdk/android/src/java/org/webrtc/Camera2Session.java
View file

@ -21,9 +21,9 @@ import android.hardware.camera2.CameraMetadata;
import android.hardware.camera2.CaptureFailure; import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest; import android.hardware.camera2.CaptureRequest;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.Range; import android.util.Range;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

2
sdk/android/src/java/org/webrtc/CameraCapturer.java
View file

@ -13,7 +13,7 @@ package org.webrtc;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

2
sdk/android/src/java/org/webrtc/EglBase10Impl.java
View file

@ -13,9 +13,9 @@ package org.webrtc;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import androidx.annotation.Nullable;
import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLContext;

2
sdk/android/src/java/org/webrtc/EglBase14Impl.java
View file

@ -19,8 +19,8 @@ import android.opengl.EGLDisplay;
import android.opengl.EGLExt; import android.opengl.EGLExt;
import android.opengl.EGLSurface; import android.opengl.EGLSurface;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import org.webrtc.EglBase; import org.webrtc.EglBase;
/** /**

2
sdk/android/src/java/org/webrtc/GlGenericDrawer.java
View file

@ -12,7 +12,7 @@ package org.webrtc;
import android.opengl.GLES11Ext; import android.opengl.GLES11Ext;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.FloatBuffer; import java.nio.FloatBuffer;
import org.webrtc.GlShader; import org.webrtc.GlShader;
import org.webrtc.GlUtil; import org.webrtc.GlUtil;

2
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View file

@ -16,8 +16,8 @@ import android.media.MediaCodecInfo;
import android.media.MediaFormat; import android.media.MediaFormat;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Map; import java.util.Map;

2
sdk/android/src/java/org/webrtc/MediaCodecUtils.java
View file

@ -14,7 +14,7 @@ import android.annotation.TargetApi;
import android.media.MediaCodecInfo; import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo.CodecCapabilities;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
View file

@ -17,7 +17,7 @@ import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaCodecList; import android.media.MediaCodecList;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
sdk/android/src/java/org/webrtc/NV12Buffer.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class NV12Buffer implements VideoFrame.Buffer { public class NV12Buffer implements VideoFrame.Buffer {

2
sdk/android/src/java/org/webrtc/NV21Buffer.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
public class NV21Buffer implements VideoFrame.Buffer { public class NV21Buffer implements VideoFrame.Buffer {

2
sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import org.webrtc.VideoFrame; import org.webrtc.VideoFrame;
import org.webrtc.VideoProcessor; import org.webrtc.VideoProcessor;

2
sdk/android/src/java/org/webrtc/RefCountDelegate.java
View file

@ -10,7 +10,7 @@
package org.webrtc; package org.webrtc;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**

2
sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java
View file

@ -11,7 +11,7 @@
package org.webrtc; package org.webrtc;
// Explicit imports necessary for JNI generation. // Explicit imports necessary for JNI generation.
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import org.webrtc.VideoEncoder; import org.webrtc.VideoEncoder;
/** /**

2
sdk/android/src/java/org/webrtc/audio/VolumeLogger.java
View file

@ -11,7 +11,7 @@
package org.webrtc.audio; package org.webrtc.audio;
import android.media.AudioManager; import android.media.AudioManager;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import org.webrtc.Logging; import org.webrtc.Logging;

2
sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
View file

@ -15,7 +15,7 @@ import android.media.audiofx.AudioEffect;
import android.media.audiofx.AudioEffect.Descriptor; import android.media.audiofx.AudioEffect.Descriptor;
import android.media.audiofx.NoiseSuppressor; import android.media.audiofx.NoiseSuppressor;
import android.os.Build; import android.os.Build;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.util.UUID; import java.util.UUID;
import org.webrtc.Logging; import org.webrtc.Logging;

4
sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
View file

@ -20,8 +20,8 @@ import android.media.AudioRecordingConfiguration;
import android.media.MediaRecorder.AudioSource; import android.media.MediaRecorder.AudioSource;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import java.lang.System; import java.lang.System;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Arrays; import java.util.Arrays;

2
sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java
View file

@ -18,7 +18,7 @@ import android.media.AudioManager;
import android.media.AudioTrack; import android.media.AudioTrack;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.webrtc.CalledByNative; import org.webrtc.CalledByNative;
import org.webrtc.Logging; import org.webrtc.Logging;

2
sdk/android/tests/src/org/webrtc/FakeMediaCodecWrapper.java
View file

@ -16,8 +16,8 @@ import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaCrypto; import android.media.MediaCrypto;
import android.media.MediaFormat; import android.media.MediaFormat;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;