From 957158b7ffe1a07d267bf31cb6a2cb52d672e8bb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 09:50:08 -0700
Subject: [PATCH] Fix 2.5.0 lint errors

- Publish IMA extension
- Force IMA to use the correct version of the support library
- Add missing sr translations for repeat mode strings

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163705883
---
 extensions/ima/build.gradle                     | 17 +++++++++++++++++
 .../exoplayer2/mediacodec/MediaCodecInfo.java   |  2 +-
 library/ui/src/main/res/values-sr/strings.xml   |  3 +++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 7732751296..fc7dc088e8 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -14,6 +14,12 @@ android {
 
 dependencies {
     compile project(modulePrefix + 'library-core')
+    // This dependency is necessary to force the supportLibraryVersion of
+    // com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via:
+    // com.google.android.gms:play-services-ads:11.0.2
+    // |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
+    //   |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
+    //     |-- com.android.support:support-v4:25.2.0
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
     compile 'com.google.android.gms:play-services-ads:11.0.2'
@@ -23,3 +29,14 @@ dependencies {
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
     androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion
 }
+
+ext {
+    javadocTitle = 'IMA extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-ima'
+    releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
index 17ef2c4456..2e5b04f4a9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java
@@ -64,7 +64,7 @@ public final class MediaCodecInfo {
   /**
    * Whether the decoder is secure.
    *
-   * @see CodecCapabilities#isFeatureRequired(String)
+   * @see CodecCapabilities#isFeatureSupported(String)
    * @see CodecCapabilities#FEATURE_SecurePlayback
    */
   public final boolean secure;
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 175ad4fe7f..0d54de5f6a 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -22,4 +22,7 @@
   <string name="exo_controls_stop_description">"Заустави"</string>
   <string name="exo_controls_rewind_description">"Премотај уназад"</string>
   <string name="exo_controls_fastforward_description">"Премотај унапред"</string>
+  <string name="exo_controls_repeat_all_description">"Понови све"</string>
+  <string name="exo_controls_repeat_off_description">"Понављање је искључено"</string>
+  <string name="exo_controls_repeat_one_description">"Понови једну"</string>
 </resources>