zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -13,7 +13,7 @@ package org.webrtc;
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 {

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.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;

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

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

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

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

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

@ -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;

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.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;

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

@ -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;

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

@ -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. */

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.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;

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

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

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

@ -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;

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

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

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

@ -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 {

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

@ -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 */

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

@ -12,7 +12,7 @@ package org.webrtc;
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;

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.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;

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

@ -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;

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

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* 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.os.Process;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.List;
import org.webrtc.Logging.Severity;
import org.webrtc.PeerConnection;

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

@ -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. */

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

@ -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;

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

@ -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. */

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

@ -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. */

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.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.

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

@ -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;

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

@ -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;

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.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;

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

@ -12,7 +12,7 @@ package org.webrtc;
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

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

@ -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;

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

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

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

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

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

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/** Factory for creating VideoEncoders. */
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.Point;
import android.opengl.GLES20;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
/**

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

@ -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

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

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
/**
* 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.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;

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.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;