From d12c7235f9875f74b92d4ba92c5a92fb45c9f749 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 2 Dec 2019 13:56:44 +0000
Subject: [PATCH] Bump targetSdkVersion to 29 for demo apps only

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

diff --git a/constants.gradle b/constants.gradle
index decb25c666..65812e4274 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -16,7 +16,8 @@ project.ext {
     releaseVersion = '2.11.0'
     releaseVersionCode = 2011000
     minSdkVersion = 16
-    targetSdkVersion = 28
+    appTargetSdkVersion = 29
+    targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved
     compileSdkVersion = 29
     dexmakerVersion = '2.21.0'
     mockitoVersion = '2.25.0'
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
index 69e8ddc52d..f9228e4b79 100644
--- a/demos/cast/build.gradle
+++ b/demos/cast/build.gradle
@@ -26,7 +26,7 @@ android {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
-        targetSdkVersion project.ext.targetSdkVersion
+        targetSdkVersion project.ext.appTargetSdkVersion
     }
 
     buildTypes {
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index d03d75f077..ab47b6de81 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -26,7 +26,7 @@ android {
         versionName project.ext.releaseVersion
         versionCode project.ext.releaseVersionCode
         minSdkVersion project.ext.minSdkVersion
-        targetSdkVersion project.ext.targetSdkVersion
+        targetSdkVersion project.ext.appTargetSdkVersion
     }
 
     buildTypes {
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 355ba43405..0240a377ac 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
       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 1f653f160e..bff05901b5 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 29
+        targetSdkVersion project.ext.appTargetSdkVersion
     }
 
     buildTypes {