diff --git a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
index 36fbf1dec..03ae90f83 100644
--- a/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
+++ b/Examples/OneSignalDemo/app/src/main/AndroidManifest.xml
@@ -49,7 +49,8 @@
 
         <receiver
             android:name="com.onesignal.ADMMessageHandler$Receiver"
-            android:permission="com.amazon.device.messaging.permission.SEND" >
+            android:permission="com.amazon.device.messaging.permission.SEND"
+            android:exported="true">
 
             <!-- To interact with ADM, your app must listen for the following intents. -->
             <intent-filter>
@@ -64,7 +65,9 @@
         <meta-data android:name="com.onesignal.NotificationServiceExtension"
             android:value="com.onesignal.sdktest.notification.NotificationServiceExtension" />
 
-        <activity android:name=".activity.SplashActivity">
+        <activity
+            android:name=".activity.SplashActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml b/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
index d9d67149c..420ebfb32 100644
--- a/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/debug/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
         <receiver
             android:name="com.onesignal.FCMBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND"
+            android:exported="true">
             <!-- High priority so OneSignal payloads can be filtered from other FCM receivers -->
             <intent-filter android:priority="999" >
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
diff --git a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
index e61472397..ed445b01d 100644
--- a/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/main/AndroidManifest.xml
@@ -74,43 +74,59 @@
         <activity
           android:name="com.onesignal.NotificationOpenedActivityHMS"
           android:noHistory="true"
-          android:theme="@android:style/Theme.Translucent.NoTitleBar">
+          android:theme="@android:style/Theme.Translucent.NoTitleBar"
+          android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             </intent-filter>
         </activity>
 
-        <service android:name="com.onesignal.FCMIntentService" />
+        <service
+            android:name="com.onesignal.FCMIntentService"
+            android:exported="false" />
 
-        <service android:name="com.onesignal.FCMIntentJobService"
-            android:permission="android.permission.BIND_JOB_SERVICE"/>
+        <service
+            android:name="com.onesignal.FCMIntentJobService"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="false" />
 
         <service
           android:name="com.onesignal.FocusDelaySyncService"
-          android:stopWithTask="true" />
+          android:stopWithTask="true"
+          android:exported="false"/>
         <service
           android:name="com.onesignal.FocusDelaySyncJobService"
-          android:permission="android.permission.BIND_JOB_SERVICE" />
+          android:permission="android.permission.BIND_JOB_SERVICE"
+          android:exported="false" />
 
         <service
           android:name="com.onesignal.SyncService"
-          android:stopWithTask="true" />
+          android:stopWithTask="true"
+          android:exported="false" />
         <service
           android:name="com.onesignal.SyncJobService"
-          android:permission="android.permission.BIND_JOB_SERVICE" />
+          android:permission="android.permission.BIND_JOB_SERVICE"
+          android:exported="false" />
 
         <activity android:name="com.onesignal.PermissionsActivity"
-                  android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                  android:exported="false" />
 
-        <receiver android:name="com.onesignal.NotificationDismissReceiver" />
+        <receiver
+            android:name="com.onesignal.NotificationDismissReceiver"
+            android:exported="true"/>
 
-        <receiver android:name="com.onesignal.BootUpReceiver">
+        <receiver
+            android:name="com.onesignal.BootUpReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <receiver android:name="com.onesignal.UpgradeReceiver" >
+        <receiver
+            android:name="com.onesignal.UpgradeReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
@@ -119,7 +135,8 @@
         <activity
           android:name="com.onesignal.NotificationOpenedReceiver"
           android:noHistory="true"
-          android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+          android:theme="@android:style/Theme.Translucent.NoTitleBar"
+          android:exported="true" />
 
     </application>
 
diff --git a/OneSignalSDK/onesignal/src/release/AndroidManifest.xml b/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
index d9d67149c..420ebfb32 100644
--- a/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
+++ b/OneSignalSDK/onesignal/src/release/AndroidManifest.xml
@@ -9,7 +9,8 @@
 
         <receiver
             android:name="com.onesignal.FCMBroadcastReceiver"
-            android:permission="com.google.android.c2dm.permission.SEND" >
+            android:permission="com.google.android.c2dm.permission.SEND"
+            android:exported="true">
             <!-- High priority so OneSignal payloads can be filtered from other FCM receivers -->
             <intent-filter android:priority="999" >
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />