From b7bc1fee9f39362039efd3465a0e34a0920f1ebe Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 20 Dec 2019 10:23:27 +0000
Subject: [PATCH] Add missing @Nullable to
 MediaCodecAudioRenderer.getMediaClock

Without this @Nullable, potential subclasses can't  override the
method to return null if they don't want to use the renderer as a
media clock.

Issue:#6792
PiperOrigin-RevId: 286545736
---
 RELEASENOTES.md                                                | 3 +++
 .../android/exoplayer2/audio/MediaCodecAudioRenderer.java      | 1 +
 .../android/exoplayer2/audio/SimpleDecoderAudioRenderer.java   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 322afc5769b..074294ae0a3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -16,6 +16,9 @@
     `SsaStyle$SsaAlignment`
     ([#6771](https://github.com/google/ExoPlayer/issues/6771)).
 * Fix `CacheDataSource` to correctly propagate `DataSpec.httpRequestHeaders`.
+* Add missing @Nullable to `MediaCodecAudioRenderer.getMediaClock` and
+  `SimpleDecoderAudioRenderer.getMediaClock`
+  ([#6792](https://github.com/google/ExoPlayer/issues/6792)).
 
 ### 2.11.0 (2019-12-11) ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
index ae50d14728d..096f4ccd1fb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
@@ -520,6 +520,7 @@ protected boolean canKeepCodecWithFlush(Format oldFormat, Format newFormat) {
   }
 
   @Override
+  @Nullable
   public MediaClock getMediaClock() {
     return this;
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
index 5ccbf04c5cd..60870204ccc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
@@ -218,6 +218,7 @@ public SimpleDecoderAudioRenderer(
   }
 
   @Override
+  @Nullable
   public MediaClock getMediaClock() {
     return this;
   }