diff --git a/aidl/fingerprint/Session.cpp b/aidl/fingerprint/Session.cpp
index 6f650463..e5429f6f 100644
--- a/aidl/fingerprint/Session.cpp
+++ b/aidl/fingerprint/Session.cpp
@@ -412,9 +412,12 @@ void Session::notify(const fingerprint_msg_t* msg) {
             LOG(DEBUG) << "onEnumerate(fid=" << msg->data.enumerated.finger.fid
                        << ", gid=" << msg->data.enumerated.finger.gid
                        << ", rem=" << msg->data.enumerated.remaining_templates << ")";
-            std::vector<int> enrollments;
+            static std::vector<int> enrollments;
             enrollments.push_back(msg->data.enumerated.finger.fid);
-            mCb->onEnrollmentsEnumerated(enrollments);
+            if (msg->data.enumerated.remaining_templates == 0) {
+                mCb->onEnrollmentsEnumerated(enrollments);
+                enrollments.clear();
+            }
         } break;
     }
 }
diff --git a/doze/AndroidManifest.xml b/doze/AndroidManifest.xml
index 5d04b018..50662877 100644
--- a/doze/AndroidManifest.xml
+++ b/doze/AndroidManifest.xml
@@ -12,27 +12,32 @@
 
     <uses-sdk
         android:minSdkVersion="24"
-        android:targetSdkVersion="26"/>
+        android:targetSdkVersion="34"/>
 
     <application
         android:label="@string/device_settings_app_name"
         android:persistent="true">
 
-        <receiver android:name=".BootCompletedReceiver">
+        <receiver
+            android:name=".BootCompletedReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </receiver>
 
-        <service android:name=".SamsungDozeService"
-                 android:permission="SamsungDozeService">
+        <service
+            android:name=".SamsungDozeService"
+            android:exported="true"
+            android:permission="SamsungDozeService">
         </service>
 
         <activity
             android:name=".SamsungDozeActivity"
             android:label="@string/ambient_display_title"
-            android:theme="@style/Theme.SubSettingsBase">
+            android:theme="@style/Theme.SubSettingsBase"
+            android:exported="true">
             <intent-filter>
                 <action android:name="org.lineageos.settings.device.DOZE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />