From 491e13806ff96153304c80f64547726875e19d12 Mon Sep 17 00:00:00 2001
From: Andy Valdez <avaldez31890@gmail.com>
Date: Mon, 10 Jun 2024 17:34:33 -0400
Subject: [PATCH] Revert "Merge pull request #19981 from
 wordpress-mobile/fix/target-sdk-14-foreground-service-types"

This reverts commit 621ccfb6fdb0bd6a9ec1ccb3453fb2b3ef2414ac, reversing
changes made to c9602d925121e29d5c41b6b27583dce73ad30b36.
---
 WordPress/src/main/AndroidManifest.xml | 57 +++++++++-----------------
 1 file changed, 19 insertions(+), 38 deletions(-)

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index dfb16f0c711f..715c240b83c5 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -844,105 +844,88 @@
         <service
             android:name=".ui.reader.services.update.ReaderUpdateService"
             android:exported="false"
-            android:label="Reader Update Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Update Service" />
         <service
             android:name=".ui.reader.services.update.ReaderUpdateJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Reader Update JobService"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Update JobService" />
 
         <service
             android:name=".ui.reader.services.discover.ReaderDiscoverService"
             android:exported="false"
-            android:label="Reader Discover Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Discover Service" />
         <service
             android:name=".ui.reader.services.discover.ReaderDiscoverJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Reader Discover JobService"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Discover JobService" />
 
         <service
             android:name=".ui.reader.services.post.ReaderPostService"
             android:exported="false"
-            android:label="Reader Post Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Post Service" />
         <service
             android:name=".ui.reader.services.post.ReaderPostJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Reader Post JobService"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Post JobService" />
 
         <service
             android:name=".ui.reader.services.search.ReaderSearchService"
             android:exported="false"
-            android:label="Reader Search Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Search Service" />
         <service
             android:name=".ui.reader.services.search.ReaderSearchJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Reader Search Job Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Search Job Service" />
 
         <service
             android:name=".ui.reader.services.comment.ReaderCommentService"
             android:exported="false"
-            android:label="Reader Comment Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Reader Comment Service" />
 
         <service
             android:name=".ui.suggestion.service.SuggestionService"
             android:exported="false"
-            android:label="Suggestion Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Suggestion Service" />
         <service
             android:name=".push.NotificationsProcessingService"
             android:exported="false"
-            android:label="Notifications Quick Actions processing Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Notifications Quick Actions processing Service" />
 
         <service
             android:name=".ui.notifications.services.NotificationsUpdateService"
             android:exported="false"
-            android:label="Notifications Update Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Notifications Update Service" />
         <service
             android:name=".ui.notifications.services.NotificationsUpdateJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Notifications Update Job Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Notifications Update Job Service" />
 
         <service
             android:name=".util.analytics.service.InstallationReferrerService"
             android:exported="true"
             android:permission="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"
-            android:label="Installation Referrer Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Installation Referrer Service" />
 
         <service
             android:name=".util.analytics.service.InstallationReferrerJobService"
             android:permission="android.permission.BIND_JOB_SERVICE"
             android:exported="false"
-            android:label="Installation Referrer Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Installation Referrer Service" />
 
         <service
             android:name=".login.LoginWpcomService"
             android:exported="false"
-            android:label="Login to WPCOM Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Login to WPCOM Service" />
 
         <service
             android:name=".ui.sitecreation.services.SiteCreationService"
             android:exported="false"
-            android:label="Site Creation Service"
-            android:foregroundServiceType="dataSync"/>
+            android:label="Site Creation Service" />
 
         <!-- Samsung multiwindow support -->
         <uses-library
@@ -1016,8 +999,7 @@
         <receiver android:name=".ui.notifications.DismissNotificationReceiver" />
         <service
             android:name=".ui.stats.refresh.lists.widget.WidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS"
-            android:foregroundServiceType="dataSync"/>
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <activity
             android:name=".ui.stats.refresh.lists.widget.views.StatsViewsWidgetConfigureActivity"
@@ -1077,8 +1059,7 @@
 
         <service
             android:name=".push.GCMMessageService"
-            android:exported="false"
-            android:foregroundServiceType="dataSync">
+            android:exported="false" >
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>