diff --git a/ring-android/app/src/main/AndroidManifest.xml b/ring-android/app/src/main/AndroidManifest.xml
index 23a491db5f7616529e8240eaf225676548d2d708..52bd97dcf349760c53e5a69ab9eec4680df5dde2 100644
--- a/ring-android/app/src/main/AndroidManifest.xml
+++ b/ring-android/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="cx.ring"
     android:installLocation="auto"
     android:versionCode="103"
@@ -82,7 +83,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:resizeableActivity="true"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:ignore="UnusedAttribute">
 
         <activity
             android:name=".launch.LaunchActivity"
@@ -155,8 +157,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize"
             android:label="@string/app_name"
             android:screenOrientation="fullUser"
-            android:theme="@style/AppTheme.ActionBar.Transparent"
             android:showOnLockScreen="true"
+            android:theme="@style/AppTheme.ActionBar.Transparent"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.CALL" />
@@ -301,16 +303,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             android:theme="@style/LeanbackPreferences" />
 
         <service
-            android:name=".services.RingFirebaseMessagingService">
+            android:name=".services.RingFirebaseMessagingService"
+            android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
 
         <service
-            android:name=".services.RingFirebaseInstanceIdService">
+            android:name=".services.RingFirebaseInstanceIdService"
+            android:exported="false">
             <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>