From c6e5b67626baae294d5c7a99dbac9f384bafb3fe Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Wed, 28 Jun 2017 08:42:49 -0700 Subject: [PATCH] Move InlinedApi warning suppression to class level for C ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=160412354 --- .../java/com/google/android/exoplayer2/C.java | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java index f5bf98716c..62afbc98a7 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/C.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/C.java @@ -31,6 +31,7 @@ import java.util.UUID; /** * Defines constants used by the library. */ +@SuppressWarnings("InlinedApi") public final class C { private C() {} @@ -101,24 +102,20 @@ public final class C { /** * @see MediaCodec#CRYPTO_MODE_UNENCRYPTED */ - @SuppressWarnings("InlinedApi") public static final int CRYPTO_MODE_UNENCRYPTED = MediaCodec.CRYPTO_MODE_UNENCRYPTED; /** * @see MediaCodec#CRYPTO_MODE_AES_CTR */ - @SuppressWarnings("InlinedApi") public static final int CRYPTO_MODE_AES_CTR = MediaCodec.CRYPTO_MODE_AES_CTR; /** * @see MediaCodec#CRYPTO_MODE_AES_CBC */ - @SuppressWarnings("InlinedApi") public static final int CRYPTO_MODE_AES_CBC = MediaCodec.CRYPTO_MODE_AES_CBC; /** * Represents an unset {@link android.media.AudioTrack} session identifier. Equal to * {@link AudioManager#AUDIO_SESSION_ID_GENERATE}. */ - @SuppressWarnings("InlinedApi") public static final int AUDIO_SESSION_ID_UNSET = AudioManager.AUDIO_SESSION_ID_GENERATE; /** @@ -160,28 +157,24 @@ public final class C { /** * @see AudioFormat#ENCODING_AC3 */ - @SuppressWarnings("InlinedApi") public static final int ENCODING_AC3 = AudioFormat.ENCODING_AC3; /** * @see AudioFormat#ENCODING_E_AC3 */ - @SuppressWarnings("InlinedApi") public static final int ENCODING_E_AC3 = AudioFormat.ENCODING_E_AC3; /** * @see AudioFormat#ENCODING_DTS */ - @SuppressWarnings("InlinedApi") public static final int ENCODING_DTS = AudioFormat.ENCODING_DTS; /** * @see AudioFormat#ENCODING_DTS_HD */ - @SuppressWarnings("InlinedApi") public static final int ENCODING_DTS_HD = AudioFormat.ENCODING_DTS_HD; /** * @see AudioFormat#CHANNEL_OUT_7POINT1_SURROUND */ - @SuppressWarnings({"InlinedApi", "deprecation"}) + @SuppressWarnings("deprecation") public static final int CHANNEL_OUT_7POINT1_SURROUND = Util.SDK_INT < 23 ? AudioFormat.CHANNEL_OUT_7POINT1 : AudioFormat.CHANNEL_OUT_7POINT1_SURROUND; @@ -239,29 +232,24 @@ public final class C { /** * @see android.media.AudioAttributes#CONTENT_TYPE_MOVIE */ - @SuppressWarnings("InlinedApi") public static final int CONTENT_TYPE_MOVIE = android.media.AudioAttributes.CONTENT_TYPE_MOVIE; /** * @see android.media.AudioAttributes#CONTENT_TYPE_MUSIC */ - @SuppressWarnings("InlinedApi") public static final int CONTENT_TYPE_MUSIC = android.media.AudioAttributes.CONTENT_TYPE_MUSIC; /** * @see android.media.AudioAttributes#CONTENT_TYPE_SONIFICATION */ - @SuppressWarnings("InlinedApi") public static final int CONTENT_TYPE_SONIFICATION = android.media.AudioAttributes.CONTENT_TYPE_SONIFICATION; /** * @see android.media.AudioAttributes#CONTENT_TYPE_SPEECH */ - @SuppressWarnings("InlinedApi") public static final int CONTENT_TYPE_SPEECH = android.media.AudioAttributes.CONTENT_TYPE_SPEECH; /** * @see android.media.AudioAttributes#CONTENT_TYPE_UNKNOWN */ - @SuppressWarnings("InlinedApi") public static final int CONTENT_TYPE_UNKNOWN = android.media.AudioAttributes.CONTENT_TYPE_UNKNOWN; @@ -277,7 +265,6 @@ public final class C { /** * @see android.media.AudioAttributes#FLAG_AUDIBILITY_ENFORCED */ - @SuppressWarnings("InlinedApi") public static final int FLAG_AUDIBILITY_ENFORCED = android.media.AudioAttributes.FLAG_AUDIBILITY_ENFORCED; @@ -295,86 +282,71 @@ public final class C { /** * @see android.media.AudioAttributes#USAGE_ALARM */ - @SuppressWarnings("InlinedApi") public static final int USAGE_ALARM = android.media.AudioAttributes.USAGE_ALARM; /** * @see android.media.AudioAttributes#USAGE_ASSISTANCE_ACCESSIBILITY */ - @SuppressWarnings("InlinedApi") public static final int USAGE_ASSISTANCE_ACCESSIBILITY = android.media.AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY; /** * @see android.media.AudioAttributes#USAGE_ASSISTANCE_NAVIGATION_GUIDANCE */ - @SuppressWarnings("InlinedApi") public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = android.media.AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE; /** * @see android.media.AudioAttributes#USAGE_ASSISTANCE_SONIFICATION */ - @SuppressWarnings("InlinedApi") public static final int USAGE_ASSISTANCE_SONIFICATION = android.media.AudioAttributes.USAGE_ASSISTANCE_SONIFICATION; /** * @see android.media.AudioAttributes#USAGE_GAME */ - @SuppressWarnings("InlinedApi") public static final int USAGE_GAME = android.media.AudioAttributes.USAGE_GAME; /** * @see android.media.AudioAttributes#USAGE_MEDIA */ - @SuppressWarnings("InlinedApi") public static final int USAGE_MEDIA = android.media.AudioAttributes.USAGE_MEDIA; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION = android.media.AudioAttributes.USAGE_NOTIFICATION; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_DELAYED */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_INSTANT */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION_COMMUNICATION_REQUEST */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = android.media.AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION_EVENT */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION_EVENT = android.media.AudioAttributes.USAGE_NOTIFICATION_EVENT; /** * @see android.media.AudioAttributes#USAGE_NOTIFICATION_RINGTONE */ - @SuppressWarnings("InlinedApi") public static final int USAGE_NOTIFICATION_RINGTONE = android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE; /** * @see android.media.AudioAttributes#USAGE_UNKNOWN */ - @SuppressWarnings("InlinedApi") public static final int USAGE_UNKNOWN = android.media.AudioAttributes.USAGE_UNKNOWN; /** * @see android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION */ - @SuppressWarnings("InlinedApi") public static final int USAGE_VOICE_COMMUNICATION = android.media.AudioAttributes.USAGE_VOICE_COMMUNICATION; /** * @see android.media.AudioAttributes#USAGE_VOICE_COMMUNICATION_SIGNALLING */ - @SuppressWarnings("InlinedApi") public static final int USAGE_VOICE_COMMUNICATION_SIGNALLING = android.media.AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING; @@ -388,12 +360,10 @@ public final class C { /** * Indicates that a buffer holds a synchronization sample. */ - @SuppressWarnings("InlinedApi") public static final int BUFFER_FLAG_KEY_FRAME = MediaCodec.BUFFER_FLAG_KEY_FRAME; /** * Flag for empty buffers that signal that the end of the stream was reached. */ - @SuppressWarnings("InlinedApi") public static final int BUFFER_FLAG_END_OF_STREAM = MediaCodec.BUFFER_FLAG_END_OF_STREAM; /** * Indicates that a buffer is (at least partially) encrypted. @@ -413,13 +383,11 @@ public final class C { /** * @see MediaCodec#VIDEO_SCALING_MODE_SCALE_TO_FIT */ - @SuppressWarnings("InlinedApi") public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT; /** * @see MediaCodec#VIDEO_SCALING_MODE_SCALE_TO_FIT */ - @SuppressWarnings("InlinedApi") public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING; /** @@ -730,17 +698,14 @@ public final class C { /** * @see MediaFormat#COLOR_STANDARD_BT709 */ - @SuppressWarnings("InlinedApi") public static final int COLOR_SPACE_BT709 = MediaFormat.COLOR_STANDARD_BT709; /** * @see MediaFormat#COLOR_STANDARD_BT601_PAL */ - @SuppressWarnings("InlinedApi") public static final int COLOR_SPACE_BT601 = MediaFormat.COLOR_STANDARD_BT601_PAL; /** * @see MediaFormat#COLOR_STANDARD_BT2020 */ - @SuppressWarnings("InlinedApi") public static final int COLOR_SPACE_BT2020 = MediaFormat.COLOR_STANDARD_BT2020; /** @@ -752,17 +717,14 @@ public final class C { /** * @see MediaFormat#COLOR_TRANSFER_SDR_VIDEO */ - @SuppressWarnings("InlinedApi") public static final int COLOR_TRANSFER_SDR = MediaFormat.COLOR_TRANSFER_SDR_VIDEO; /** * @see MediaFormat#COLOR_TRANSFER_ST2084 */ - @SuppressWarnings("InlinedApi") public static final int COLOR_TRANSFER_ST2084 = MediaFormat.COLOR_TRANSFER_ST2084; /** * @see MediaFormat#COLOR_TRANSFER_HLG */ - @SuppressWarnings("InlinedApi") public static final int COLOR_TRANSFER_HLG = MediaFormat.COLOR_TRANSFER_HLG; /** @@ -774,12 +736,10 @@ public final class C { /** * @see MediaFormat#COLOR_RANGE_LIMITED */ - @SuppressWarnings("InlinedApi") public static final int COLOR_RANGE_LIMITED = MediaFormat.COLOR_RANGE_LIMITED; /** * @see MediaFormat#COLOR_RANGE_FULL */ - @SuppressWarnings("InlinedApi") public static final int COLOR_RANGE_FULL = MediaFormat.COLOR_RANGE_FULL; /**