From 45ab1bafb6902ceed42f33d02f36e869e23a4d4f Mon Sep 17 00:00:00 2001
From: Jeff DeCew <jeffdq@google.com>
Date: Sun, 7 Nov 2021 18:20:35 +0000
Subject: [PATCH] Fixes for SysUi-Studio gradle build

* Gralde now fails if AndroidManifest.xml uses the <uses-sdk> tag.

Test: gradle build
Change-Id: I759431dfe01c73a351419d97c9575c74d7dcdd8d
---
 packages/SettingsLib/AndroidManifest.xml                      | 2 --
 packages/SettingsLib/MainSwitchPreference/AndroidManifest.xml | 4 ----
 packages/SettingsLib/Utils/AndroidManifest.xml                | 2 --
 packages/SystemUI/plugin/AndroidManifest.xml                  | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/packages/SettingsLib/AndroidManifest.xml b/packages/SettingsLib/AndroidManifest.xml
index ad62f6e23ef0d..a3473459948d8 100644
--- a/packages/SettingsLib/AndroidManifest.xml
+++ b/packages/SettingsLib/AndroidManifest.xml
@@ -18,6 +18,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.settingslib">
 
-    <uses-sdk android:minSdkVersion="29" />
-
 </manifest>
diff --git a/packages/SettingsLib/MainSwitchPreference/AndroidManifest.xml b/packages/SettingsLib/MainSwitchPreference/AndroidManifest.xml
index 5817f77eb6d96..6e0d82768148d 100644
--- a/packages/SettingsLib/MainSwitchPreference/AndroidManifest.xml
+++ b/packages/SettingsLib/MainSwitchPreference/AndroidManifest.xml
@@ -18,8 +18,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.settingslib.widget">
 
-    <uses-sdk
-        android:minSdkVersion="28"
-        android:targetSdkVersion="31"/>
-
 </manifest>
diff --git a/packages/SettingsLib/Utils/AndroidManifest.xml b/packages/SettingsLib/Utils/AndroidManifest.xml
index fd89676ab6d7f..e9957a9efd388 100644
--- a/packages/SettingsLib/Utils/AndroidManifest.xml
+++ b/packages/SettingsLib/Utils/AndroidManifest.xml
@@ -18,6 +18,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.settingslib.utils">
 
-    <uses-sdk android:minSdkVersion="21" />
-
 </manifest>
diff --git a/packages/SystemUI/plugin/AndroidManifest.xml b/packages/SystemUI/plugin/AndroidManifest.xml
index 7c057dc78ac77..811595ade9790 100644
--- a/packages/SystemUI/plugin/AndroidManifest.xml
+++ b/packages/SystemUI/plugin/AndroidManifest.xml
@@ -18,7 +18,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.systemui.plugins">
 
-    <uses-sdk
-        android:minSdkVersion="21" />
-
 </manifest>