From f56db87c99f07a434654eb5c74570ade8a39c324 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 17 Sep 2020 13:08:05 +0100
Subject: [PATCH] Add SDK_INT mapping from S -> 31

PiperOrigin-RevId: 332211266
---
 .../main/java/com/google/android/exoplayer2/util/Util.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
index f954b60c45..cfc7b5a5f3 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
@@ -102,7 +102,10 @@ public final class Util {
    * Like {@link android.os.Build.VERSION#SDK_INT}, but in a place where it can be conveniently
    * overridden for local testing.
    */
-  public static final int SDK_INT = "R".equals(Build.VERSION.CODENAME) ? 30 : Build.VERSION.SDK_INT;
+  public static final int SDK_INT =
+      "S".equals(Build.VERSION.CODENAME)
+          ? 31
+          : "R".equals(Build.VERSION.CODENAME) ? 30 : Build.VERSION.SDK_INT;
 
   /**
    * Like {@link Build#DEVICE}, but in a place where it can be conveniently overridden for local