From 2af872256ffcafe2ab443d36e24c26bea0300353 Mon Sep 17 00:00:00 2001
From: Shepherd <andrealee053@gmail.com>
Date: Wed, 2 Feb 2022 17:34:46 -0500
Subject: [PATCH 1/3] Added AndroidManifest with location permissions to the
 example app to display PromptLocation

---
 .../Plugins/Android/AndroidManifest.xml       | 22 +++++++++++++++++++
 .../Plugins/Android/AndroidManifest.xml.meta  |  7 ++++++
 .../Android/LauncherManifest.xml.DISABLED     | 18 +++++++++++++++
 .../LauncherManifest.xml.DISABLED.meta        |  7 ++++++
 .../ProjectSettings/ProjectSettings.asset     |  2 +-
 5 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml
 create mode 100644 OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml.meta
 create mode 100644 OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
 create mode 100644 OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta

diff --git a/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml b/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml
new file mode 100644
index 000000000..f1526c519
--- /dev/null
+++ b/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+        </activity>
+    </application>
+</manifest>
diff --git a/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml.meta b/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml.meta
new file mode 100644
index 000000000..81a37fd29
--- /dev/null
+++ b/OneSignalExample/Assets/Plugins/Android/AndroidManifest.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3a6951c1fb3344de58dee430938a00b2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
new file mode 100644
index 000000000..c89dd82c5
--- /dev/null
+++ b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="preferExternal">
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
+
+    <application android:extractNativeLibs="true"
+                 android:label="@string/app_name"
+                 android:icon="@mipmap/app_icon"/>
+</manifest>
diff --git a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta
new file mode 100644
index 000000000..488f8b2c7
--- /dev/null
+++ b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 35dae8c70a70d40f5952b8b1bb41ea59
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/OneSignalExample/ProjectSettings/ProjectSettings.asset b/OneSignalExample/ProjectSettings/ProjectSettings.asset
index ac1d74b03..87dbbe46a 100644
--- a/OneSignalExample/ProjectSettings/ProjectSettings.asset
+++ b/OneSignalExample/ProjectSettings/ProjectSettings.asset
@@ -236,7 +236,7 @@ PlayerSettings:
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
-  useCustomMainManifest: 0
+  useCustomMainManifest: 1
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 1
   useCustomLauncherGradleManifest: 0

From da7f3cc1a0f921e80e6de7f5096a93cbde6bb5a4 Mon Sep 17 00:00:00 2001
From: Shepherd <andrealee053@gmail.com>
Date: Wed, 2 Feb 2022 17:39:34 -0500
Subject: [PATCH 2/3] Updated CHANGELOG

---
 OneSignalExample/Assets/OneSignal/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md
index 6f36d3994..b5f0ccd8e 100644
--- a/OneSignalExample/Assets/OneSignal/CHANGELOG.md
+++ b/OneSignalExample/Assets/OneSignal/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - iOS build post processor will determine extension's imported OneSignalXCFramework from the package's dependencies xml
 ### Changed
+- Added AndroidManifest with location permissions to the example app to display `PromptLocation`
 - `InstallEdm4uStep` now imports version [1.2.169](https://github.com/googlesamples/unity-jar-resolver/releases/tag/v1.2.169) of [EDM4U](https://github.com/googlesamples/unity-jar-resolver)
 - Log an error in the example app when `RequiresPrivacyConsent` is attempted to be set to false from true
 

From b7d8a04997286ebdd29f767999279c8b475cb150 Mon Sep 17 00:00:00 2001
From: Shepherd <andrealee053@gmail.com>
Date: Fri, 4 Feb 2022 11:53:25 -0500
Subject: [PATCH 3/3] Removed LauncherManifest.xml.DISABLED and its meta file

---
 .../Android/LauncherManifest.xml.DISABLED      | 18 ------------------
 .../Android/LauncherManifest.xml.DISABLED.meta |  7 -------
 2 files changed, 25 deletions(-)
 delete mode 100644 OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
 delete mode 100644 OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta

diff --git a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
deleted file mode 100644
index c89dd82c5..000000000
--- a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="preferExternal">
-    <supports-screens
-        android:smallScreens="true"
-        android:normalScreens="true"
-        android:largeScreens="true"
-        android:xlargeScreens="true"
-        android:anyDensity="true"/>
-
-    <application android:extractNativeLibs="true"
-                 android:label="@string/app_name"
-                 android:icon="@mipmap/app_icon"/>
-</manifest>
diff --git a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta b/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta
deleted file mode 100644
index 488f8b2c7..000000000
--- a/OneSignalExample/Assets/Plugins/Android/LauncherManifest.xml.DISABLED.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 35dae8c70a70d40f5952b8b1bb41ea59
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: