Skip to content

Commit 491e138

Browse files
notandyveenotandyvee
committed
Revert "Merge pull request #19981 from wordpress-mobile/fix/target-sdk-14-foreground-service-types"
This reverts commit 621ccfb, reversing changes made to c9602d9.
1 parent 2d65fbb commit 491e138

1 file changed

Lines changed: 19 additions & 38 deletions

File tree

‎WordPress/src/main/AndroidManifest.xml‎

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -844,105 +844,88 @@
844844
<service
845845
android:name=".ui.reader.services.update.ReaderUpdateService"
846846
android:exported="false"
847-
android:label="Reader Update Service"
848-
android:foregroundServiceType="dataSync"/>
847+
android:label="Reader Update Service" />
849848
<service
850849
android:name=".ui.reader.services.update.ReaderUpdateJobService"
851850
android:permission="android.permission.BIND_JOB_SERVICE"
852851
android:exported="false"
853-
android:label="Reader Update JobService"
854-
android:foregroundServiceType="dataSync"/>
852+
android:label="Reader Update JobService" />
855853

856854
<service
857855
android:name=".ui.reader.services.discover.ReaderDiscoverService"
858856
android:exported="false"
859-
android:label="Reader Discover Service"
860-
android:foregroundServiceType="dataSync"/>
857+
android:label="Reader Discover Service" />
861858
<service
862859
android:name=".ui.reader.services.discover.ReaderDiscoverJobService"
863860
android:permission="android.permission.BIND_JOB_SERVICE"
864861
android:exported="false"
865-
android:label="Reader Discover JobService"
866-
android:foregroundServiceType="dataSync"/>
862+
android:label="Reader Discover JobService" />
867863

868864
<service
869865
android:name=".ui.reader.services.post.ReaderPostService"
870866
android:exported="false"
871-
android:label="Reader Post Service"
872-
android:foregroundServiceType="dataSync"/>
867+
android:label="Reader Post Service" />
873868
<service
874869
android:name=".ui.reader.services.post.ReaderPostJobService"
875870
android:permission="android.permission.BIND_JOB_SERVICE"
876871
android:exported="false"
877-
android:label="Reader Post JobService"
878-
android:foregroundServiceType="dataSync"/>
872+
android:label="Reader Post JobService" />
879873

880874
<service
881875
android:name=".ui.reader.services.search.ReaderSearchService"
882876
android:exported="false"
883-
android:label="Reader Search Service"
884-
android:foregroundServiceType="dataSync"/>
877+
android:label="Reader Search Service" />
885878
<service
886879
android:name=".ui.reader.services.search.ReaderSearchJobService"
887880
android:permission="android.permission.BIND_JOB_SERVICE"
888881
android:exported="false"
889-
android:label="Reader Search Job Service"
890-
android:foregroundServiceType="dataSync"/>
882+
android:label="Reader Search Job Service" />
891883

892884
<service
893885
android:name=".ui.reader.services.comment.ReaderCommentService"
894886
android:exported="false"
895-
android:label="Reader Comment Service"
896-
android:foregroundServiceType="dataSync"/>
887+
android:label="Reader Comment Service" />
897888

898889
<service
899890
android:name=".ui.suggestion.service.SuggestionService"
900891
android:exported="false"
901-
android:label="Suggestion Service"
902-
android:foregroundServiceType="dataSync"/>
892+
android:label="Suggestion Service" />
903893
<service
904894
android:name=".push.NotificationsProcessingService"
905895
android:exported="false"
906-
android:label="Notifications Quick Actions processing Service"
907-
android:foregroundServiceType="dataSync"/>
896+
android:label="Notifications Quick Actions processing Service" />
908897

909898
<service
910899
android:name=".ui.notifications.services.NotificationsUpdateService"
911900
android:exported="false"
912-
android:label="Notifications Update Service"
913-
android:foregroundServiceType="dataSync"/>
901+
android:label="Notifications Update Service" />
914902
<service
915903
android:name=".ui.notifications.services.NotificationsUpdateJobService"
916904
android:permission="android.permission.BIND_JOB_SERVICE"
917905
android:exported="false"
918-
android:label="Notifications Update Job Service"
919-
android:foregroundServiceType="dataSync"/>
906+
android:label="Notifications Update Job Service" />
920907

921908
<service
922909
android:name=".util.analytics.service.InstallationReferrerService"
923910
android:exported="true"
924911
android:permission="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"
925-
android:label="Installation Referrer Service"
926-
android:foregroundServiceType="dataSync"/>
912+
android:label="Installation Referrer Service" />
927913

928914
<service
929915
android:name=".util.analytics.service.InstallationReferrerJobService"
930916
android:permission="android.permission.BIND_JOB_SERVICE"
931917
android:exported="false"
932-
android:label="Installation Referrer Service"
933-
android:foregroundServiceType="dataSync"/>
918+
android:label="Installation Referrer Service" />
934919

935920
<service
936921
android:name=".login.LoginWpcomService"
937922
android:exported="false"
938-
android:label="Login to WPCOM Service"
939-
android:foregroundServiceType="dataSync"/>
923+
android:label="Login to WPCOM Service" />
940924

941925
<service
942926
android:name=".ui.sitecreation.services.SiteCreationService"
943927
android:exported="false"
944-
android:label="Site Creation Service"
945-
android:foregroundServiceType="dataSync"/>
928+
android:label="Site Creation Service" />
946929

947930
<!-- Samsung multiwindow support -->
948931
<uses-library
@@ -1016,8 +999,7 @@
1016999
<receiver android:name=".ui.notifications.DismissNotificationReceiver" />
10171000
<service
10181001
android:name=".ui.stats.refresh.lists.widget.WidgetService"
1019-
android:permission="android.permission.BIND_REMOTEVIEWS"
1020-
android:foregroundServiceType="dataSync"/>
1002+
android:permission="android.permission.BIND_REMOTEVIEWS" />
10211003

10221004
<activity
10231005
android:name=".ui.stats.refresh.lists.widget.views.StatsViewsWidgetConfigureActivity"
@@ -1077,8 +1059,7 @@
10771059

10781060
<service
10791061
android:name=".push.GCMMessageService"
1080-
android:exported="false"
1081-
android:foregroundServiceType="dataSync">
1062+
android:exported="false" >
10821063
<intent-filter>
10831064
<action android:name="com.google.firebase.MESSAGING_EVENT" />
10841065
</intent-filter>

0 commit comments

Comments
 (0)