From 724cb64be80c393913d615c9c1c9a875471a4879 Mon Sep 17 00:00:00 2001
From: eatsfoobars <eatsfoobars@tutanota.com>
Date: Fri, 6 Dec 2019 01:21:23 +0000
Subject: [PATCH] Fix conflicting provider error

---
 patches/branding/996.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/patches/branding/996.patch b/patches/branding/996.patch
index 6b57adc..7d897f8 100644
--- a/patches/branding/996.patch
+++ b/patches/branding/996.patch
@@ -74,6 +74,23 @@ diff -crB from/AndroidManifest.xml to/AndroidManifest.xml
           </provider>
           <meta-data android:name="firebase_crashlytics_collection_enabled" android:value="true"/>
 ***************
+*** 130,136 ****
+              <meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+              <meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+          </service>
+!         <provider android:authorities="com.discord.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
+          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
+--- 130,136 ----
+              <meta-data android:name="com.google.firebase.components:com.google.firebase.iid.Registrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+              <meta-data android:name="com.google.firebase.components:com.google.firebase.abt.component.AbtRegistrar" android:value="com.google.firebase.components.ComponentRegistrar"/>
+          </service>
+!         <provider android:authorities="com.cutthecord.CTCBRANCH.firebaseperfprovider" android:exported="false" android:initOrder="101" android:name="com.google.firebase.perf.provider.FirebasePerfProvider"/>
+          <receiver android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsReceiver"/>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsService"/>
+          <service android:enabled="true" android:exported="false" android:name="com.google.android.gms.analytics.AnalyticsJobService" android:permission="android.permission.BIND_JOB_SERVICE"/>
+***************
 *** 145,151 ****
               </intent-filter>
           </receiver>