From 39e0444841e423175d325751ea6667dc8f8a6d54 Mon Sep 17 00:00:00 2001
From: Mike Hardy <github@mikehardy.net>
Date: Fri, 17 Jun 2022 11:25:27 -0500
Subject: [PATCH] fix(android): specify that android services are not exported

Additionally, app is directBootAware - this mirrors upstream definition:
https://github.com/firebase/firebase-android-sdk/blob/ad135d8c3c1243b4c673e17bc032ee1052fb2a22/firebase-common/src/main/AndroidManifest.xml#L10-L12
---
 packages/app/android/src/main/AndroidManifest.xml       | 8 +++++++-
 packages/messaging/android/src/main/AndroidManifest.xml | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/app/android/src/main/AndroidManifest.xml b/packages/app/android/src/main/AndroidManifest.xml
index c427b5f22a..3b1fe1e008 100644
--- a/packages/app/android/src/main/AndroidManifest.xml
+++ b/packages/app/android/src/main/AndroidManifest.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   package="io.invertase.firebase">
 
   <application>
     <meta-data android:name="app_data_collection_default_enabled" android:value="${firebaseJsonDataCollectionDefaultEnabled}"/>
-    <service android:name="com.google.firebase.components.ComponentDiscoveryService">
+    <service
+      android:name="com.google.firebase.components.ComponentDiscoveryService"
+      android:directBootAware="true"
+      android:exported="false"
+      tools:targetApi="n"
+    >
       <meta-data
         android:name="com.google.firebase.components:io.invertase.firebase.app.ReactNativeFirebaseAppRegistrar"
         android:value="com.google.firebase.components.ComponentRegistrar" />
diff --git a/packages/messaging/android/src/main/AndroidManifest.xml b/packages/messaging/android/src/main/AndroidManifest.xml
index 699830adba..2f6741bd7a 100644
--- a/packages/messaging/android/src/main/AndroidManifest.xml
+++ b/packages/messaging/android/src/main/AndroidManifest.xml
@@ -7,7 +7,8 @@
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
   <application>
-    <service android:name=".ReactNativeFirebaseMessagingHeadlessService" />
+    <service android:name=".ReactNativeFirebaseMessagingHeadlessService"
+              android:exported="false" />
     <service android:name=".ReactNativeFirebaseMessagingService"
              android:exported="false">
       <intent-filter>