1 files changed, 12 insertions, 17 deletions
diff --git a/java/com/android/voicemail/impl/AndroidManifest.xml b/java/com/android/voicemail/impl/AndroidManifest.xml
index 47a4b2dd3..8c0d67f6b 100644
--- a/java/com/android/voicemail/impl/AndroidManifest.xml
+++ b/java/com/android/voicemail/impl/AndroidManifest.xml
@@ -31,7 +31,8 @@
 
     <receiver
       android:name="com.android.voicemail.impl.sms.OmtpMessageReceiver"
-      android:exported="false">
+      android:exported="false"
+      android:directBootAware="true">
       <intent-filter>
         <action android:name="com.android.vociemailomtp.sms.sms_received"/>
       </intent-filter>
@@ -40,7 +41,7 @@
     <receiver android:name="com.android.voicemail.impl.VoicemailClientReceiver"
       android:exported="false">
       <intent-filter>
-        <action android:name="com.android.voicemailomtp.VoicemailClient.ACTION_UPLOAD"/>
+        <action android:name="com.android.voicemail.VoicemailClient.ACTION_UPLOAD"/>
       </intent-filter>
     </receiver>
 
@@ -76,8 +77,8 @@
       </intent-filter>
     </receiver>
 
-    <service
-      android:name="com.android.voicemail.impl.scheduling.TaskSchedulerService"
+    <receiver
+      android:name="com.android.voicemail.impl.scheduling.TaskReceiver"
       android:exported="false"/>
 
     <service
@@ -90,12 +91,15 @@
         android:permission="android.permission.BIND_JOB_SERVICE"
         android:exported="false"/>
 
-    <receiver android:name="com.android.voicemail.impl.OmtpReceiver"
-      android:exported="true">
+    <service
+        android:name="com.android.voicemail.impl.OmtpService"
+        android:permission="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"
+        android:exported="true"
+        android:directBootAware="true">
       <intent-filter>
-        <action android:name="com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
+        <action android:name="android.telephony.VisualVoicemailService"/>
       </intent-filter>
-    </receiver>
+    </service>
 
     <activity
       android:name="com.android.voicemail.impl.settings.VoicemailChangePinActivity"
@@ -109,14 +113,5 @@
         <action android:name="android.intent.action.BOOT_COMPLETED" />
       </intent-filter>
     </receiver>
-
-    <receiver android:name="com.android.voicemail.impl.VvmPackageInstallReceiver">
-      <intent-filter>
-        <!-- New O broadcast, can be received in background. Only applies to installation and not
-           updates -->
-        <action android:name="android.intent.action.PACKAGE_FIRST_ADDED" />
-        <data android:scheme="package"/>
-      </intent-filter>
-    </receiver>
   </application>
 </manifest>