1 files changed, 6 insertions, 0 deletions
diff --git a/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java b/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
index 5a2fe146e..ef6f6322c 100644
--- a/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
+++ b/java/com/android/voicemail/impl/sync/OmtpVvmSyncReceiver.java
@@ -22,6 +22,7 @@ import android.content.Intent;
 import android.provider.VoicemailContract;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
+import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.ActivationTask;
 import com.android.voicemail.impl.VvmLog;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
@@ -33,6 +34,11 @@ public class OmtpVvmSyncReceiver extends BroadcastReceiver {
 
   @Override
   public void onReceive(final Context context, Intent intent) {
+    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
+      // ACTION_SYNC_VOICEMAIL is available pre-O
+      return;
+    }
+
     if (VoicemailContract.ACTION_SYNC_VOICEMAIL.equals(intent.getAction())) {
       VvmLog.v(TAG, "Sync intent received");