From 1e20d4a4eed8fceaa21bb0a82c6b6a53775cf5e5 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 14 Jul 2021 11:38:54 +0300
Subject: [PATCH] Android: Add Android 12 to SDK Manager parsing

Allow SDK Manager to parse packages from android-s as Android 12
properly.

Pick-to: 4.15
Change-Id: I3feae845e5b8d98fe1a70988cf6e2ac1d9a5c16a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidmanager.cpp    | 2 ++
 src/plugins/android/androidsdkmanager.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index e82a7109ad6..53bc79cd1f7 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -461,6 +461,8 @@ QString AndroidManager::androidNameForApiLevel(int x)
         return QLatin1String("Android 10");
     case 30:
         return QLatin1String("Android 11");
+    case 31:
+        return QLatin1String("Android 12");
     default:
         return tr("Unknown Android version. API Level: %1").arg(x);
     }
diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp
index c62dcbd2c85..18bed57f2d4 100644
--- a/src/plugins/android/androidsdkmanager.cpp
+++ b/src/plugins/android/androidsdkmanager.cpp
@@ -84,6 +84,8 @@ int platformNameToApiLevel(const QString &platformName)
                 apiLevel = 29;
             else if (apiLevelStr == 'R')
                 apiLevel = 30;
+            else if (apiLevelStr == 'S')
+                apiLevel = 31;
         }
     }
     return apiLevel;