From 2e4ab8b387d2d858800220fef59fe363875a2d42 Mon Sep 17 00:00:00 2001
From: Sebastian Kaspari <s.kaspari@gmail.com>
Date: Thu, 28 Feb 2019 14:51:10 +0100
Subject: [PATCH] Closes #699: Firefox flavors: Re-use sharedUserId.

---
 app/src/firefoxBeta/AndroidManifest.xml    | 11 +++++++++++
 app/src/firefoxNightly/AndroidManifest.xml | 11 +++++++++++
 app/src/firefoxRelease/AndroidManifest.xml | 11 +++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 app/src/firefoxBeta/AndroidManifest.xml
 create mode 100644 app/src/firefoxNightly/AndroidManifest.xml
 create mode 100644 app/src/firefoxRelease/AndroidManifest.xml

diff --git a/app/src/firefoxBeta/AndroidManifest.xml b/app/src/firefoxBeta/AndroidManifest.xml
new file mode 100644
index 000000000..4f6328151
--- /dev/null
+++ b/app/src/firefoxBeta/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  sharedUserId: This flavor is meant to replace Firefox (Beta channel) and therefore needs to inherit
+                its sharedUserId for all eternity. Shipping an app update without sharedUserId can have
+                fatal consequences. For example see:
+                - https://issuetracker.google.com/issues/36924841
+                - https://issuetracker.google.com/issues/36905922
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      android:sharedUserId="org.mozilla.firefox.sharedID">
+</manifest>
diff --git a/app/src/firefoxNightly/AndroidManifest.xml b/app/src/firefoxNightly/AndroidManifest.xml
new file mode 100644
index 000000000..b108579eb
--- /dev/null
+++ b/app/src/firefoxNightly/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  sharedUserId: This flavor is meant to replace Firefox (Nightly channel) and therefore needs to inherit
+                its sharedUserId for all eternity. Shipping an app update without sharedUserId can have
+                fatal consequences. For example see:
+                - https://issuetracker.google.com/issues/36924841
+                - https://issuetracker.google.com/issues/36905922
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      android:sharedUserId="org.mozilla.fennec.sharedID">
+</manifest>
diff --git a/app/src/firefoxRelease/AndroidManifest.xml b/app/src/firefoxRelease/AndroidManifest.xml
new file mode 100644
index 000000000..46a1c91bb
--- /dev/null
+++ b/app/src/firefoxRelease/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  sharedUserId: This flavor is meant to replace Firefox (Release channel) and therefore needs to inherit
+                its sharedUserId for all eternity. Shipping an app update without sharedUserId can have
+                fatal consequences. For example see:
+                - https://issuetracker.google.com/issues/36924841
+                - https://issuetracker.google.com/issues/36905922
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      android:sharedUserId="org.mozilla.firefox.sharedID">
+</manifest>