From 9cfc75ff8a5fc9e3a01e96c5588a7e166e56ed1a Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 20 Jan 2020 14:59:21 +0000
Subject: [PATCH] Fix warning about adjacent overload methods in TtmlStyle

PiperOrigin-RevId: 290610936
---
 .../exoplayer2/text/ttml/TtmlStyle.java       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
index 3a600029f5..2ccbe7d85b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
@@ -166,19 +166,8 @@ import java.lang.annotation.RetentionPolicy;
   }
 
   /**
-   * Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which
-   * are not inheritable are not inherited as well as properties which are already set locally
-   * are never overridden.
-   *
-   * @param ancestor the ancestor style to inherit from
-   */
-  public TtmlStyle inherit(TtmlStyle ancestor) {
-    return inherit(ancestor, false);
-  }
-
-  /**
-   * Chains this style to referential style. Local properties which are already set
-   * are never overridden.
+   * Chains this style to referential style. Local properties which are already set are never
+   * overridden.
    *
    * @param ancestor the referential style to inherit from
    */
@@ -186,6 +175,17 @@ import java.lang.annotation.RetentionPolicy;
     return inherit(ancestor, true);
   }
 
+  /**
+   * Inherits from an ancestor style. Properties like <i>tts:backgroundColor</i> which are not
+   * inheritable are not inherited as well as properties which are already set locally are never
+   * overridden.
+   *
+   * @param ancestor the ancestor style to inherit from
+   */
+  public TtmlStyle inherit(TtmlStyle ancestor) {
+    return inherit(ancestor, false);
+  }
+
   private TtmlStyle inherit(TtmlStyle ancestor, boolean chaining) {
     if (ancestor != null) {
       if (!hasFontColor && ancestor.hasFontColor) {