This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.

This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2

Test: make

master is already up to date and

Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9

Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136

5 files changed, 37 insertions, 10 deletions

diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
index bc6ffb5a7..a0bae36cc 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
@@ -92,7 +92,7 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic
       }
     }
     alertItem.updateStatus(statuses, this);
-    // TODO(twyen): b/30668323 support error from multiple sources.
+    // TODO: b/30668323 support error from multiple sources.
     return;
   }
 
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
index 9c1e446ab..f160e024e 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackLayout.java
@@ -85,7 +85,7 @@ public class VoicemailPlaybackLayout extends LinearLayout
           // When the undo button is pressed, the viewHolder we have is no longer valid because when
           // we hide the view it is binded to something else, and the layout is not updated for
           // hidden items. copy the adapter position so we can update the view upon undo.
-          // TODO(twyen): refactor this so the view holder will always be valid.
+          // TODO: refactor this so the view holder will always be valid.
           final int adapterPosition = mViewHolder.getAdapterPosition();
 
           mPresenter.pausePlayback();
diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
index 5c9bc01c2..6d5015a22 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java
@@ -57,6 +57,7 @@ import com.android.dialer.constants.Constants;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.dialer.phonenumbercache.CallLogQuery;
+import com.android.dialer.telecom.TelecomUtil;
 import com.android.dialer.util.PermissionsUtil;
 import com.google.common.io.ByteStreams;
 import java.io.File;
@@ -515,6 +516,11 @@ public class VoicemailPlaybackPresenter
     mView.disableUiElements();
     mIsPrepared = false;
 
+    if (mContext != null && TelecomUtil.isInCall(mContext)) {
+      handleError(new IllegalStateException("Cannot play voicemail when call is in progress"));
+      return;
+    }
+
     try {
       mMediaPlayer = new MediaPlayer();
       mMediaPlayer.setOnPreparedListener(this);
diff --git a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
index 56de4e91a..e3dc0b0b7 100644
--- a/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/VoicemailTosMessageCreator.java
@@ -33,8 +33,8 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.dialer.app.voicemail.error.VoicemailErrorMessage.Action;
-import com.android.dialer.buildtype.BuildType;
 import com.android.dialer.common.LogUtil;
+import com.android.dialer.configprovider.ConfigProviderBindings;
 import com.android.dialer.logging.DialerImpression;
 import com.android.dialer.logging.Logger;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
@@ -75,17 +75,15 @@ public class VoicemailTosMessageCreator {
 
   @Nullable
   VoicemailErrorMessage maybeCreateTosMessage() {
-    // TODO(mdooley): add filtering based on carrier
+    // TODO: add filtering based on carrier
     if (hasAcceptedTos()) {
       return null;
     }
-    // TODO(mdooley): temporarily skip the terms of service for dogfood builds
-    if (BuildType.get() == BuildType.DOGFOOD) {
-      LogUtil.i(
-          "VoicemailTosMessageCreator.maybeCreateTosMessage",
-          "Skipping voicemail ToS for dogfood build");
+
+    if (!shouldShowTos()) {
       return null;
     }
+
     logTosCreatedImpression();
 
     return new VoicemailTosMessage(
@@ -121,6 +119,25 @@ public class VoicemailTosMessageCreator {
         .setImageResourceId(getTosImageId());
   }
 
+  private boolean shouldShowTos() {
+    if (isVvm3()) {
+      LogUtil.i("VoicemailTosMessageCreator.shouldShowTos", "showing TOS for verizon");
+      return true;
+    }
+
+    if (isVoicemailTranscriptionEnabled()) {
+      LogUtil.i(
+          "VoicemailTosMessageCreator.shouldShowTos", "showing TOS for Google transcription users");
+      return true;
+    }
+
+    return false;
+  }
+
+  private boolean isVoicemailTranscriptionEnabled() {
+    return ConfigProviderBindings.get(context).getBoolean("voicemail_transcription_enabled", false);
+  }
+
   private void showDeclineTosDialog(final PhoneAccountHandle handle) {
     if (isVvm3() && Vvm3VoicemailMessageCreator.PIN_NOT_SET == status.configurationState) {
       LogUtil.i(
@@ -249,6 +266,10 @@ public class VoicemailTosMessageCreator {
   }
 
   private CharSequence getDialerTos() {
+    if (!isVoicemailTranscriptionEnabled()) {
+      return "";
+    }
+
     return useSpanish()
         ? context.getString(R.string.dialer_terms_and_conditions_1_0_spanish)
         : context.getString(R.string.dialer_terms_and_conditions_1_0_english);
diff --git a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
index d3024f4c5..e639eff23 100644
--- a/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
+++ b/java/com/android/dialer/app/voicemail/error/Vvm3VoicemailMessageCreator.java
@@ -259,7 +259,7 @@ public class Vvm3VoicemailMessageCreator {
 
   @NonNull
   private static CharSequence getCustomerSupportString(Context context, int id) {
-    // TODO(twyen): get number based on the country the user is currently in.
+    // TODO: get number based on the country the user is currently in.
     return ContactDisplayUtils.getTtsSpannedPhoneNumber(
         context.getResources(),
         id,