From 90f411141ba768400bbde7893e68eb2194a5aea5 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 16 May 2019 13:01:29 +0900
Subject: [PATCH] Remove min sdk version and set target/max sdk version to 29

Min sdk version has been force set to 28 (P) to support beta devices.
Since we now don't need to support them, we delete it. It is set to 29
by the build system.

Target and max sdk versions are bumped to 29.

Bug: 131128233
Test: m and check the sdk version numbers
Change-Id: I9ecf2b7542bde239955daf91c88b8e612d7d7069
---
 apex/AndroidManifest-media.xml   | 5 ++---
 apex/AndroidManifest-swcodec.xml | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apex/AndroidManifest-media.xml b/apex/AndroidManifest-media.xml
index 78ed0edcdf..1af4586177 100644
--- a/apex/AndroidManifest-media.xml
+++ b/apex/AndroidManifest-media.xml
@@ -18,10 +18,9 @@
   package="com.android.media">
   <!-- APEX does not have classes.dex -->
   <application android:hasCode="false" />
-  <!-- Setting maxSdk to lock the module to Q. minSdk is 28 for now to cover Q beta devices. -->
+  <!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->
   <uses-sdk
-      android:minSdkVersion="28"
       android:maxSdkVersion="29"
-      android:targetSdkVersion="28"
+      android:targetSdkVersion="29"
   />
 </manifest>
diff --git a/apex/AndroidManifest-swcodec.xml b/apex/AndroidManifest-swcodec.xml
index 9558644bb3..de50864aaa 100644
--- a/apex/AndroidManifest-swcodec.xml
+++ b/apex/AndroidManifest-swcodec.xml
@@ -18,10 +18,9 @@
   package="com.android.media.swcodec">
   <!-- APEX does not have classes.dex -->
   <application android:hasCode="false" />
-  <!-- Setting maxSdk to lock the module to Q. minSdk is 28 for now to cover Q beta devices. -->
+  <!-- Setting maxSdk to lock the module to Q. minSdk is auto-set by build system -->
   <uses-sdk
-      android:minSdkVersion="28"
       android:maxSdkVersion="29"
-      android:targetSdkVersion="28"
+      android:targetSdkVersion="29"
   />
 </manifest>