From ab9a83c82f3b433d3d0a6e0c64adaa2bfd75e1af Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 22 Jan 2021 05:03:33 -0800
Subject: [PATCH] Bump target SDK to 30

---
 app/shared/src/main/AndroidManifest.xml | 18 +++++++++++++----
 app/src/main/AndroidManifest.xml        | 26 ++++++++++---------------
 build.gradle.kts                        |  2 +-
 stub/build.gradle.kts                   |  2 +-
 stub/src/main/AndroidManifest.xml       | 24 ++++++++---------------
 5 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index 79cd798f9..52ccfd959 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -2,16 +2,26 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.shared">
 
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="29"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
 
     <application
-        android:label="Magisk Manager"
+        android:allowBackup="false"
         android:installLocation="internalOnly"
-        android:usesCleartextTraffic="true"
+        android:label="Magisk Manager"
+        android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        tools:ignore="UnusedAttribute">
-    </application>
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute" />
 
 </manifest>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 28a97b807..1026ca1e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,18 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
-
     <application
-        android:icon="@drawable/ic_launcher"
         android:name="a.e"
-        android:allowBackup="false"
-        android:multiArch="true"
         android:extractNativeLibs="true"
+        android:icon="@drawable/ic_launcher"
+        android:multiArch="true"
         tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
 
         <!-- Splash -->
@@ -42,15 +35,16 @@
             android:exported="false"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <!-- Receiver -->
         <receiver
             android:name="a.h"
-            android:directBootAware="true">
+            android:directBootAware="true"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
@@ -72,8 +66,7 @@
             android:authorities="${applicationId}.provider"
             android:directBootAware="true"
             android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
+            android:grantUriPermissions="true" />
 
         <!-- Hardcode GMS version -->
         <meta-data
@@ -84,12 +77,13 @@
         <provider
             android:name="androidx.work.impl.WorkManagerInitializer"
             android:authorities="${applicationId}.workmanager-init"
-            tools:node="remove" />
+            tools:node="remove"
+            tools:ignore="ExportedContentProvider" />
 
         <!-- We don't invalidate Room -->
         <service
             android:name="androidx.room.MultiInstanceInvalidationService"
-            tools:node="remove"/>
+            tools:node="remove" />
 
         <!-- We don't use Device Credentials -->
         <activity
diff --git a/build.gradle.kts b/build.gradle.kts
index 8597400f0..4292fad07 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,7 +69,7 @@ subprojects {
                 defaultConfig {
                     if (minSdkVersion == null)
                         minSdkVersion(17)
-                    targetSdkVersion(28)
+                    targetSdkVersion(30)
                 }
 
                 compileOptions {
diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts
index 4254955a2..8acd51b58 100644
--- a/stub/build.gradle.kts
+++ b/stub/build.gradle.kts
@@ -9,7 +9,7 @@ android {
         applicationId = "com.topjohnwu.magisk"
         versionCode = 1
         versionName = Config.version
-        buildConfigField("int", "STUB_VERSION", "15")
+        buildConfigField("int", "STUB_VERSION", "16")
         buildConfigField("String", "DEV_CHANNEL", Config["DEV_CHANNEL"] ?: "null")
         buildConfigField("boolean", "CANARY", if (canary) "true" else "false")
     }
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 02339a47f..200f1f734 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -4,24 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
 
     <application
-        android:appComponentFactory=".DelegateComponentFactory"
         android:name="a.e"
-        android:allowBackup="false"
-        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" >
+        android:appComponentFactory=".DelegateComponentFactory"
+        tools:ignore="GoogleAppIndexingWarning,MissingApplicationIcon,UnusedAttribute">
 
         <!-- Splash -->
-        <activity
-            android:name="a.c">
+        <activity android:name="a.c">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -43,15 +35,16 @@
             android:exported="false"
             tools:ignore="AppLinkUrlError">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <!-- Receiver -->
         <receiver
             android:name="a.h"
-            android:directBootAware="true">
+            android:directBootAware="true"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.REBOOT" />
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
@@ -73,8 +66,7 @@
             android:authorities="${applicationId}.provider"
             android:directBootAware="true"
             android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
+            android:grantUriPermissions="true" />
 
         <!-- Hardcode GMS version -->
         <meta-data