From 1031dae19b1550bcce103e9f582ac745bd3f1386 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 22 Apr 2020 08:45:07 +0100
Subject: [PATCH] Change some annotations placement Checkerframework now warns
 about.

PiperOrigin-RevId: 307764457
---
 .../google/android/exoplayer2/DefaultRenderersFactory.java    | 2 +-
 .../google/android/exoplayer2/source/ads/AdsMediaSource.java  | 2 +-
 .../android/exoplayer2/source/chunk/InitializationChunk.java  | 2 +-
 .../com/google/android/exoplayer2/text/ttml/TtmlDecoder.java  | 4 ++--
 .../com/google/android/exoplayer2/text/ttml/TtmlNode.java     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
index ccdddb8ce7..a09f85d42f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
@@ -89,7 +89,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
   private long allowedVideoJoiningTimeMs;
   private boolean enableDecoderFallback;
   private MediaCodecSelector mediaCodecSelector;
-  @MediaCodecRenderer.MediaCodecOperationMode private int mediaCodecOperationMode;
+  private @MediaCodecRenderer.MediaCodecOperationMode int mediaCodecOperationMode;
 
   /** @param context A {@link Context}. */
   public DefaultRenderersFactory(Context context) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
index b7b87c36c8..6da65ad98b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -402,7 +402,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
     private final MediaSource adMediaSource;
     private final List<MaskingMediaPeriod> activeMediaPeriods;
 
-    @MonotonicNonNull private Timeline timeline;
+    private @MonotonicNonNull Timeline timeline;
 
     public AdMediaSourceHolder(MediaSource adMediaSource) {
       this.adMediaSource = adMediaSource;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
index eedcad3072..8b954af2f8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java
@@ -39,7 +39,7 @@ public final class InitializationChunk extends Chunk {
 
   private final ChunkExtractorWrapper extractorWrapper;
 
-  @MonotonicNonNull private TrackOutputProvider trackOutputProvider;
+  private @MonotonicNonNull TrackOutputProvider trackOutputProvider;
   private long nextLoadPosition;
   private volatile boolean loadCanceled;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
index 80009d4aac..8955201a41 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
@@ -461,8 +461,8 @@ public final class TtmlDecoder extends SimpleSubtitleDecoder {
     return parentStyleIds.isEmpty() ? new String[0] : Util.split(parentStyleIds, "\\s+");
   }
 
-  @PolyNull
-  private TtmlStyle parseStyleAttributes(XmlPullParser parser, @PolyNull TtmlStyle style) {
+  private @PolyNull TtmlStyle parseStyleAttributes(
+      XmlPullParser parser, @PolyNull TtmlStyle style) {
     int attributeCount = parser.getAttributeCount();
     for (int i = 0; i < attributeCount; i++) {
       String attributeValue = parser.getAttributeValue(i);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
index c8e9ed7ce0..7b1dda10fd 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
@@ -120,7 +120,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
   private final HashMap<String, Integer> nodeStartsByRegion;
   private final HashMap<String, Integer> nodeEndsByRegion;
 
-  @MonotonicNonNull private List<TtmlNode> children;
+  private @MonotonicNonNull List<TtmlNode> children;
 
   public static TtmlNode buildTextNode(String text) {
     return new TtmlNode(