Merge "Make changes to Connection in Telecomm API (4/4)" into lmp-dev

3 files changed, 0 insertions, 24 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 97949097a..fc5c79bd6 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -70,7 +70,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     private TextView mPhoneNumber;
     private TextView mNumberLabel;
     private TextView mPrimaryName;
-    private View mCallStateButton;
     private ImageView mCallStateIcon;
     private ImageView mCallStateVideoCallIcon;
     private TextView mCallStateLabel;
@@ -220,14 +219,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             }
         });
 
-        mCallStateButton = view.findViewById(R.id.callStateButton);
-        mCallStateButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                getPresenter().phoneAccountClicked();
-            }
-        });
-
         mManageConferenceCallButton = view.findViewById(R.id.manage_conference_call_button);
         mManageConferenceCallButton.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 60a12730c..36a6b31d2 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -349,13 +349,6 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
         }
     }
 
-    public void phoneAccountClicked() {
-        if (mPrimary == null) {
-            return;
-        }
-        TelecommAdapter.getInstance().phoneAccountClicked(mPrimary.getId());
-    }
-
     private void maybeStartSearch(Call call, boolean isPrimary) {
         // no need to start search for conference calls which show generic info.
         if (call != null && !call.isConferenceCall()) {
diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java
index a346cafb0..bf7f51d07 100644
--- a/InCallUI/src/com/android/incallui/TelecommAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java
@@ -221,14 +221,6 @@ final class TelecommAdapter implements InCallPhoneListener {
         }
     }
 
-    void phoneAccountClicked(String callId) {
-        if (mPhone != null) {
-            getTelecommCallById(callId).phoneAccountClicked();
-        } else {
-            Log.e(this, "error phoneAccountClicked, mPhone is null");
-        }
-    }
-
     void phoneAccountSelected(String callId, PhoneAccountHandle accountHandle) {
         if (mPhone != null) {
             getTelecommCallById(callId).phoneAccountSelected(accountHandle);