diff --git a/app/src/main/java/io/nekohasekai/sfa/vendor/PrivilegedAccessRequiredException.kt b/app/src/main/java/io/nekohasekai/sfa/vendor/PrivilegedAccessRequiredException.kt
new file mode 100644
index 0000000..f582c4d
--- /dev/null
+++ b/app/src/main/java/io/nekohasekai/sfa/vendor/PrivilegedAccessRequiredException.kt
@@ -0,0 +1,3 @@
+package io.nekohasekai.sfa.vendor
+
+class PrivilegedAccessRequiredException(message: String) : Exception(message)
diff --git a/app/src/minApi23/java/io/nekohasekai/sfa/vendor/PackageQueryManager.kt b/app/src/minApi23/java/io/nekohasekai/sfa/vendor/PackageQueryManager.kt
index b14b9fe..86d7c11 100644
--- a/app/src/minApi23/java/io/nekohasekai/sfa/vendor/PackageQueryManager.kt
+++ b/app/src/minApi23/java/io/nekohasekai/sfa/vendor/PackageQueryManager.kt
@@ -10,8 +10,6 @@ import io.nekohasekai.sfa.database.Settings
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
-class PrivilegedAccessRequiredException(message: String) : Exception(message)
-
 object PackageQueryManager {
 
     private const val TAG = "PackageQueryManager"
diff --git a/app/src/other/AndroidManifest.xml b/app/src/other/AndroidManifest.xml
index ee4ba4a..2e59b16 100644
--- a/app/src/other/AndroidManifest.xml
+++ b/app/src/other/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
         <provider
@@ -11,7 +12,8 @@
 
         <service
             android:name=".vendor.RootPackageManagerService"
-            android:exported="false" />
+            android:exported="false"
+            tools:ignore="Instantiatable" />
     </application>
 
 </manifest>
diff --git a/app/src/otherLegacy/AndroidManifest.xml b/app/src/otherLegacy/AndroidManifest.xml
new file mode 100644
index 0000000..e874170
--- /dev/null
+++ b/app/src/otherLegacy/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application>
+        <service
+            android:name=".vendor.RootPackageManagerService"
+            tools:node="remove" />
+    </application>
+
+</manifest>
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 763aa6f..ac3e8b7 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -17,7 +17,8 @@
 
         <service
             android:name=".vendor.RootPackageManagerService"
-            android:exported="false" />
+            android:exported="false"
+            tools:ignore="Instantiatable" />
     </application>
 
 </manifest>