From 6535589e2f270189eeb1e418c8018a11c9e75d48 Mon Sep 17 00:00:00 2001
From: Hui Zhao <zhohz@amazon.com>
Date: Wed, 23 Mar 2022 15:01:05 -0700
Subject: [PATCH 1/3] chore(api): update example project .gitignore

---
 packages/amplify_api/example/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/amplify_api/example/.gitignore b/packages/amplify_api/example/.gitignore
index f2544a3f90..59d32e36cb 100644
--- a/packages/amplify_api/example/.gitignore
+++ b/packages/amplify_api/example/.gitignore
@@ -49,7 +49,6 @@ amplify/.config/local-*
 amplify/logs
 amplify/mock-data
 amplify/backend/amplify-meta.json
-amplify/backend/awscloudformation
 amplify/backend/.temp
 build/
 dist/

From 01ce412823401c6c7ae7c8c175afb97fbc56a9be Mon Sep 17 00:00:00 2001
From: Hui Zhao <zhohz@amazon.com>
Date: Wed, 23 Mar 2022 15:02:39 -0700
Subject: [PATCH 2/3] chore: Make example Android Apps runnable with API 32+

---
 example/android/app/src/main/AndroidManifest.xml                 | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../amplify_api/example/android/app/src/main/AndroidManifest.xml | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 .../example/android/app/src/main/AndroidManifest.xml             | 1 +
 11 files changed, 11 insertions(+)

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 583eb2f9e8..0a99e7f0fe 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/amplify/amplify_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/amplify/amplify_flutter/example/android/app/src/main/AndroidManifest.xml
index ff532a9faf..f56dc56518 100644
--- a/packages/amplify/amplify_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/amplify/amplify_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/amplify_api/example/android/app/src/main/AndroidManifest.xml b/packages/amplify_api/example/android/app/src/main/AndroidManifest.xml
index 3fe6f70237..be2da881b7 100644
--- a/packages/amplify_api/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/amplify_api/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/amplify_authenticator/example/android/app/src/main/AndroidManifest.xml b/packages/amplify_authenticator/example/android/app/src/main/AndroidManifest.xml
index 88b0567184..da66e0255a 100644
--- a/packages/amplify_authenticator/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/amplify_authenticator/example/android/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/amplify_core/example/android/app/src/main/AndroidManifest.xml b/packages/amplify_core/example/android/app/src/main/AndroidManifest.xml
index 4573357e7f..7a0fe3338a 100644
--- a/packages/amplify_core/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/amplify_core/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/amplify_datastore/example/android/app/src/main/AndroidManifest.xml b/packages/amplify_datastore/example/android/app/src/main/AndroidManifest.xml
index 342fa71f7a..bb3f3a2062 100644
--- a/packages/amplify_datastore/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/amplify_datastore/example/android/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/analytics/amplify_analytics_pinpoint/example/android/app/src/main/AndroidManifest.xml b/packages/analytics/amplify_analytics_pinpoint/example/android/app/src/main/AndroidManifest.xml
index 0e7e236171..5e668f2ea7 100644
--- a/packages/analytics/amplify_analytics_pinpoint/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/analytics/amplify_analytics_pinpoint/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/analytics/amplify_analytics_pinpoint_android/example/android/app/src/main/AndroidManifest.xml b/packages/analytics/amplify_analytics_pinpoint_android/example/android/app/src/main/AndroidManifest.xml
index 0e7e236171..5e668f2ea7 100644
--- a/packages/analytics/amplify_analytics_pinpoint_android/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/analytics/amplify_analytics_pinpoint_android/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/auth/amplify_auth_cognito/example/android/app/src/main/AndroidManifest.xml b/packages/auth/amplify_auth_cognito/example/android/app/src/main/AndroidManifest.xml
index a4317d00d0..c7dc303473 100644
--- a/packages/auth/amplify_auth_cognito/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/auth/amplify_auth_cognito/example/android/app/src/main/AndroidManifest.xml
@@ -26,6 +26,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml b/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
index a02dee9e5f..62c255250c 100644
--- a/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/storage/amplify_storage_s3/example/android/app/src/main/AndroidManifest.xml b/packages/storage/amplify_storage_s3/example/android/app/src/main/AndroidManifest.xml
index 37606e64bf..04017d5fb5 100644
--- a/packages/storage/amplify_storage_s3/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/storage/amplify_storage_s3/example/android/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user

From a1c9a55585144370f9f3482fc526e3d2a7e51815 Mon Sep 17 00:00:00 2001
From: Hui Zhao <zhohz@amazon.com>
Date: Thu, 24 Mar 2022 15:26:27 -0700
Subject: [PATCH 3/3] Remove unneeded change

---
 .../example/android/app/src/main/AndroidManifest.xml             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml b/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
index 62c255250c..a02dee9e5f 100644
--- a/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/auth/amplify_auth_cognito_android/example/android/app/src/main/AndroidManifest.xml
@@ -11,7 +11,6 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user