From a7d962bf27d411ab4d2fbc77c0fe8973f4c74be7 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Thu, 21 Nov 2019 16:24:55 +0000
Subject: [PATCH] Downgrade targetSdkVersion back to 28

- The upgrade to version 29 made Robolectric version 4.3 fail.
- Upgrading Robolectric to 4.3.1 requires Java 9, which requires manual
  configuration in Android Studio.

PiperOrigin-RevId: 281753915
---
 constants.gradle                        | 2 +-
 demos/main/src/main/AndroidManifest.xml | 1 -
 demos/surface/build.gradle              | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index 1e26525ad9..decb25c666 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -16,7 +16,7 @@ project.ext {
     releaseVersion = '2.11.0'
     releaseVersionCode = 2011000
     minSdkVersion = 16
-    targetSdkVersion = 29
+    targetSdkVersion = 28
     compileSdkVersion = 29
     dexmakerVersion = '2.21.0'
     mockitoVersion = '2.25.0'
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 0240a377ac..355ba43405 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -34,7 +34,6 @@
       android:banner="@drawable/ic_banner"
       android:largeHeap="true"
       android:allowBackup="false"
-      android:requestLegacyExternalStorage="true"
       android:name="com.google.android.exoplayer2.demo.DemoApplication"
       tools:ignore="UnusedAttribute">
 
diff --git a/demos/surface/build.gradle b/demos/surface/build.gradle
index 6963945fd5..1f653f160e 100644
--- a/demos/surface/build.gradle
+++ b/demos/surface/build.gradle
@@ -26,7 +26,7 @@ android {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
         minSdkVersion 29
-        targetSdkVersion project.ext.targetSdkVersion
+        targetSdkVersion 29
     }
 
     buildTypes {