From 9875c5d2b44cafaad5774aac3817ab433d667fe3 Mon Sep 17 00:00:00 2001
From: krocard <krocard@google.com>
Date: Thu, 6 Feb 2020 12:26:56 +0000
Subject: [PATCH] AudioCapabilities: Missing int class annotation

PiperOrigin-RevId: 293565660
---
 .../test/java/com/google/android/exoplayer2/CTest.java   | 9 +++++++++
 .../android/exoplayer2/audio/AudioCapabilities.java      | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/library/common/src/test/java/com/google/android/exoplayer2/CTest.java b/library/common/src/test/java/com/google/android/exoplayer2/CTest.java
index 26a7102b16..b784beba8d 100644
--- a/library/common/src/test/java/com/google/android/exoplayer2/CTest.java
+++ b/library/common/src/test/java/com/google/android/exoplayer2/CTest.java
@@ -18,6 +18,7 @@ package com.google.android.exoplayer2;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.annotation.SuppressLint;
+import android.media.AudioFormat;
 import android.media.MediaCodec;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
@@ -36,4 +37,12 @@ public class CTest {
     assertThat(C.CRYPTO_MODE_AES_CTR).isEqualTo(MediaCodec.CRYPTO_MODE_AES_CTR);
   }
 
+  @SuppressLint("InlinedApi")
+  @Test
+  public void testEncodingConstants() {
+    // Sanity check that encoding constant values match those defined by the platform.
+    assertThat(C.ENCODING_PCM_16BIT).isEqualTo(AudioFormat.ENCODING_PCM_16BIT);
+    assertThat(C.ENCODING_MP3).isEqualTo(AudioFormat.ENCODING_MP3);
+    assertThat(C.ENCODING_PCM_FLOAT).isEqualTo(AudioFormat.ENCODING_PCM_FLOAT);
+  }
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
index 40d42cccce..4ec8e518b3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java
@@ -24,6 +24,7 @@ import android.media.AudioManager;
 import android.net.Uri;
 import android.provider.Settings.Global;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Arrays;
 
@@ -115,10 +116,10 @@ public final class AudioCapabilities {
   /**
    * Returns whether this device supports playback of the specified audio {@code encoding}.
    *
-   * @param encoding One of {@link android.media.AudioFormat}'s {@code ENCODING_*} constants.
+   * @param encoding One of {@link C.Encoding}'s {@code ENCODING_*} constants.
    * @return Whether this device supports playback the specified audio {@code encoding}.
    */
-  public boolean supportsEncoding(int encoding) {
+  public boolean supportsEncoding(@C.Encoding int encoding) {
     return Arrays.binarySearch(supportedEncodings, encoding) >= 0;
   }