From 4cfb9dda56026af2b58192f77b32201f2eb4e00c Mon Sep 17 00:00:00 2001
From: Vimanyu <vimanyujain@google.com>
Date: Mon, 15 Mar 2021 17:07:54 -0700
Subject: [PATCH] FCM for Android now uses enqueueWork instead of startService

---
 messaging/testapp/AndroidManifest.xml                          | 3 ++-
 .../com/google/firebase/example/TestappNativeActivity.java     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/messaging/testapp/AndroidManifest.xml b/messaging/testapp/AndroidManifest.xml
index ae648799..79d62bbb 100644
--- a/messaging/testapp/AndroidManifest.xml
+++ b/messaging/testapp/AndroidManifest.xml
@@ -3,7 +3,7 @@
           package="com.google.android.messaging.testapp"
           android:versionCode="1"
           android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
+  <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="28" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
 
@@ -52,6 +52,7 @@
              android:exported="false" >
     </service>
     <service android:name="com.google.firebase.messaging.MessageForwardingService"
+             android:permission="android.permission.BIND_JOB_SERVICE"
              android:exported="false" >
     </service>
 
diff --git a/messaging/testapp/src/android/java/com/google/firebase/example/TestappNativeActivity.java b/messaging/testapp/src/android/java/com/google/firebase/example/TestappNativeActivity.java
index 290a030e..e504595a 100644
--- a/messaging/testapp/src/android/java/com/google/firebase/example/TestappNativeActivity.java
+++ b/messaging/testapp/src/android/java/com/google/firebase/example/TestappNativeActivity.java
@@ -54,7 +54,7 @@ protected void onNewIntent(Intent intent) {
       message.setAction(MessageForwardingService.ACTION_REMOTE_INTENT);
       message.putExtras(intent);
       message.setData(intent.getData());
-      startService(message);
+      MessageForwardingService.enqueueWork(this, message);
     }
     setIntent(intent);
   }