From fef163cd573b30be4c81ea1ef554db7b3ae3ff29 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Fri, 29 Jul 2022 12:07:26 +0200
Subject: [PATCH] Ported:  Update android:targetSdkVersion from 30 to 31
 Starting in August 2022, new apps will need to target API level 31 (Android
 12) or higher and adjust for behavioral changes. Read more here:
 https://developer.android.com/google/play/requirements/target-sdk - gumaciel
 https://github.com/godotengine/godot/commit/a38119a746ab0667fc2f3f071d27a904818e3872

---
 platform/android/export/export_plugin.cpp                 | 2 +-
 platform/android/java/app/AndroidManifest.xml             | 1 +
 platform/android/java/app/config.gradle                   | 2 +-
 platform/android/java/editor/src/main/AndroidManifest.xml | 2 ++
 platform/android/java/lib/AndroidManifest.xml             | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp
index d30627e23..a380d4e26 100644
--- a/platform/android/export/export_plugin.cpp
+++ b/platform/android/export/export_plugin.cpp
@@ -225,7 +225,7 @@ static const char *APK_ASSETS_DIRECTORY = "res://android/build/assets";
 static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/installTime/src/main/assets";
 
 static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
-static const int DEFAULT_TARGET_SDK_VERSION = 30; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
+static const int DEFAULT_TARGET_SDK_VERSION = 31; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
 const String SDK_VERSION_RANGE = vformat("%s,%s,1", DEFAULT_MIN_SDK_VERSION, DEFAULT_TARGET_SDK_VERSION);
 
 void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml
index 019a9a631..79b6dd992 100644
--- a/platform/android/java/app/AndroidManifest.xml
+++ b/platform/android/java/app/AndroidManifest.xml
@@ -44,6 +44,7 @@
             android:theme="@style/PandemoniumAppSplashTheme"
             android:launchMode="singleTask"
             android:excludeFromRecents="false"
+            android:exported="true"
             android:screenOrientation="landscape"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
             android:resizeableActivity="false"
diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle
index a2f2db397..354642e8e 100644
--- a/platform/android/java/app/config.gradle
+++ b/platform/android/java/app/config.gradle
@@ -2,7 +2,7 @@ ext.versions = [
     androidGradlePlugin: '7.0.3',
     compileSdk         : 31,
     minSdk             : 19, // Also update 'platform/android/java/lib/AndroidManifest.xml#minSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_MIN_SDK_VERSION'
-    targetSdk          : 30, // Also update 'platform/android/java/lib/AndroidManifest.xml#targetSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
+    targetSdk          : 31, // Also update 'platform/android/java/lib/AndroidManifest.xml#targetSdkVersion' & 'platform/android/export/export_plugin.cpp#DEFAULT_TARGET_SDK_VERSION'
     buildTools         : '30.0.3',
     kotlinVersion      : '1.6.21',
     fragmentVersion    : '1.3.6',
diff --git a/platform/android/java/editor/src/main/AndroidManifest.xml b/platform/android/java/editor/src/main/AndroidManifest.xml
index 2d09d2fea..816e64684 100644
--- a/platform/android/java/editor/src/main/AndroidManifest.xml
+++ b/platform/android/java/editor/src/main/AndroidManifest.xml
@@ -49,6 +49,7 @@
             android:process=":PandemoniumEditor"
             android:launchMode="singleTask"
             android:screenOrientation="userLandscape"
+            android:exported="false"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
             <layout android:defaultHeight="@dimen/editor_default_window_height"
                 android:defaultWidth="@dimen/editor_default_window_width" />
@@ -60,6 +61,7 @@
             android:label="@string/pandemonium_project_name_string"
             android:process=":PandemoniumGame"
             android:launchMode="singleTask"
+            android:exported="false"
             android:screenOrientation="userLandscape"
             android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
             <layout android:defaultHeight="@dimen/editor_default_window_height"
diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml
index 93413a4a3..4a0813fb6 100644
--- a/platform/android/java/lib/AndroidManifest.xml
+++ b/platform/android/java/lib/AndroidManifest.xml
@@ -5,7 +5,7 @@
     android:versionName="1.0">
 
     <!-- Should match the mindSdk and targetSdk values in platform/android/java/app/config.gradle -->
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 
     <application>