Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a

am: 01a8643549

Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f

1 files changed, 11 insertions, 0 deletions

diff --git a/java/com/android/voicemail/impl/OmtpReceiver.java b/java/com/android/voicemail/impl/OmtpReceiver.java
index b5ee61e75..239a544c4 100644
--- a/java/com/android/voicemail/impl/OmtpReceiver.java
+++ b/java/com/android/voicemail/impl/OmtpReceiver.java
@@ -27,6 +27,7 @@ import com.android.dialer.common.Assert;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.logging.nano.DialerImpression;
 import com.android.voicemail.VoicemailComponent;
+import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 
 /** Listens to com.android.phone.vvm.ACTION_TEMP_VISUAL_VOICEMAIL_SERVICE_EVENT */
@@ -63,6 +64,16 @@ public class OmtpReceiver extends BroadcastReceiver {
 
     int what = intent.getIntExtra(EXTRA_WHAT, -1);
     PhoneAccountHandle phoneAccountHandle = intent.getParcelableExtra(DATA_PHONE_ACCOUNT_HANDLE);
+    OmtpVvmCarrierConfigHelper config = new OmtpVvmCarrierConfigHelper(context, phoneAccountHandle);
+    if (!config.isValid()) {
+      VvmLog.i(TAG, "VVM not supported on " + phoneAccountHandle);
+      return;
+    }
+    if (!VisualVoicemailSettingsUtil.isEnabled(context, phoneAccountHandle)
+        && !config.isLegacyModeEnabled()) {
+      VvmLog.i(TAG, "VVM is disabled");
+      return;
+    }
     switch (what) {
       case MSG_ON_CELL_SERVICE_CONNECTED:
         VvmLog.i(TAG, "onCellServiceConnected");