From c2ea695927a5866cea732ea784a8ee4473b8ba19 Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 6 Nov 2017 16:56:11 -0800
Subject: Unify voicemail call placing

All voicemails are called by using CallIntentBuilder.forVoicemail() so the PhoneAccountHandle can be designated. A future CL will use dialogs to customize the call (multi SIM selection, RTT, etc.)

As a result voicemail error messages and legacy voicemail notifications will call the account it is received from directly.

Bug: 64216442
Test: Unit tests
PiperOrigin-RevId: 174784322
Change-Id: Ibe1c57bc7852e3d55a39a0cc2da19b6a79954c0f
---
 java/com/android/dialer/app/calllog/IntentProvider.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'java/com/android/dialer/app/calllog/IntentProvider.java')

diff --git a/java/com/android/dialer/app/calllog/IntentProvider.java b/java/com/android/dialer/app/calllog/IntentProvider.java
index c812bf83b..36e62c379 100644
--- a/java/com/android/dialer/app/calllog/IntentProvider.java
+++ b/java/com/android/dialer/app/calllog/IntentProvider.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.ContactsContract;
+import android.support.annotation.Nullable;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.contacts.common.model.Contact;
@@ -32,7 +33,6 @@ import com.android.dialer.callintent.CallInitiationType;
 import com.android.dialer.callintent.CallIntentBuilder;
 import com.android.dialer.dialercontact.DialerContact;
 import com.android.dialer.duo.DuoComponent;
-import com.android.dialer.util.CallUtil;
 import com.android.dialer.util.IntentUtil;
 import java.util.ArrayList;
 
@@ -100,11 +100,12 @@ public abstract class IntentProvider {
     };
   }
 
-  public static IntentProvider getReturnVoicemailCallIntentProvider() {
+  public static IntentProvider getReturnVoicemailCallIntentProvider(
+      @Nullable PhoneAccountHandle phoneAccountHandle) {
     return new IntentProvider() {
       @Override
       public Intent getIntent(Context context) {
-        return new CallIntentBuilder(CallUtil.getVoicemailUri(), CallInitiationType.Type.CALL_LOG)
+        return CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.CALL_LOG)
             .build();
       }
     };
-- 
cgit v1.2.3