Do not call back from original sim, ask everytime or default.

Removed feature to call back from original SIM. When user calls back, it
will either call from default or ask every time depending on system
setting.

Bug: 15473965

Change-Id: I2ea33732571b6849fbe0bd743bb0535d9eb8217e

1 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index a8c20feb0..79b602429 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -675,7 +675,8 @@ public class CallLogAdapter extends GroupingListAdapter
         views.number = number;
         views.numberPresentation = numberPresentation;
         views.callType = callType;
-        views.mAccountHandle = accountHandle;
+        // NOTE: This is currently not being used, but can be used in future versions.
+        views.accountHandle = accountHandle;
         views.voicemailUri = c.getString(CallLogQuery.VOICEMAIL_URI);
         // Stash away the Ids of the calls so that we can support deleting a row in the call log.
         views.callIds = getCallIds(c, count);
@@ -693,8 +694,7 @@ public class CallLogAdapter extends GroupingListAdapter
             // Set return call intent, otherwise null.
             if (PhoneNumberUtilsWrapper.canPlaceCallsTo(number, numberPresentation)) {
                 // Sets the primary action to call the number.
-                views.primaryActionView.setTag(IntentProvider.getReturnCallIntentProvider(number,
-                        accountHandle));
+                views.primaryActionView.setTag(IntentProvider.getReturnCallIntentProvider(number));
             } else {
                 // Number is not callable, so hide button.
                 views.primaryActionView.setTag(null);
@@ -985,7 +985,7 @@ public class CallLogAdapter extends GroupingListAdapter
         if (canPlaceCallToNumber) {
             // Sets the primary action to call the number.
             views.callBackButtonView.setTag(
-                    IntentProvider.getReturnCallIntentProvider(views.number, views.mAccountHandle));
+                    IntentProvider.getReturnCallIntentProvider(views.number));
             views.callBackButtonView.setVisibility(View.VISIBLE);
             views.callBackButtonView.setOnClickListener(mActionListener);
         } else {
@@ -997,8 +997,7 @@ public class CallLogAdapter extends GroupingListAdapter
         // If one of the calls had video capabilities, show the video call button.
         if (canPlaceCallToNumber && views.phoneCallDetailsViews.callTypeIcons.isVideoShown()) {
             views.videoCallButtonView.setTag(
-                    IntentProvider.getReturnVideoCallIntentProvider(views.number,
-                            views.mAccountHandle));
+                    IntentProvider.getReturnVideoCallIntentProvider(views.number));
             views.videoCallButtonView.setVisibility(View.VISIBLE);
             views.videoCallButtonView.setOnClickListener(mActionListener);
         } else {