From 6aa34a1c5d45b14108c3fec57dc63108f7ad7cc4 Mon Sep 17 00:00:00 2001
From: Fynn Godau <fynngodau@mailbox.org>
Date: Sat, 14 Sep 2024 00:34:14 +0200
Subject: [PATCH] Deduplicate work account service declaration

---
 .../core/src/main/AndroidManifest.xml                  | 10 +++++++---
 play-services-core/src/main/AndroidManifest.xml        |  8 --------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/play-services-auth-workaccount/core/src/main/AndroidManifest.xml b/play-services-auth-workaccount/core/src/main/AndroidManifest.xml
index ceff9cd5a1..49a9a15453 100644
--- a/play-services-auth-workaccount/core/src/main/AndroidManifest.xml
+++ b/play-services-auth-workaccount/core/src/main/AndroidManifest.xml
@@ -18,9 +18,13 @@
 
     <application>
 
-        <service
-            android:name="org.microg.gms.auth.workaccount.WorkAccountService"
-            android:exported="true" />
+        <service android:name="org.microg.gms.auth.workaccount.WorkAccountService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.android.gms.auth.account.workaccount.START" />
+            </intent-filter>
+        </service>
+
         <service
             android:name="com.google.android.gms.auth.account.authenticator.WorkAccountAuthenticatorService"
             android:process=":persistent"
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 7e253e8882..a882f9fc4a 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -493,14 +493,6 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <service android:name="org.microg.gms.auth.workaccount.WorkAccountService">
-            <intent-filter>
-                <action android:name="com.google.android.gms.auth.account.workaccount.START" />
-            </intent-filter>
-        </service>
-
-        <!-- Games -->
-
 
         <service android:name="org.microg.gms.signin.SignInService">
             <intent-filter>