diff options
| author | Ihab Awad <ihab@google.com> | 2014-07-11 18:13:26 -0700 |
|---|---|---|
| committer | Ihab Awad <ihab@google.com> | 2014-07-14 21:49:48 +0000 |
| commit | 8d38cf6761ae048b1a42504f1b59e872cf43df47 (patch) | |
| tree | 37c8d932737f6949abacc6b9343e0ecde14149c4 /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
| parent | be720ee5b611396446bc93068ff1389bd3dc59e8 (diff) | |
Implement new In-Call Service interface
Change-Id: Ic1eb6fc98e7f030885596c9c40f0ed4f0e34e28b
(cherry picked from commit c90543e6ef64b16b4c1bb240494152bc513f1e36)
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 9993ffbc4..bc9fadfd8 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -21,7 +21,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.telecomm.CallCapabilities; -import android.telecomm.CallServiceDescriptor; import android.telecomm.PhoneAccount; import android.telephony.DisconnectCause; import android.text.TextUtils; @@ -228,7 +227,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> if (mPrimary == null) { return; } - TelecommAdapter.getInstance().phoneAccountClicked(mPrimary.getCallId()); + TelecommAdapter.getInstance().phoneAccountClicked(mPrimary.getId()); } private boolean areCallsSame(Call call1, Call call2) { @@ -239,7 +238,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } // otherwise compare call Ids - return call1.getCallId().equals(call2.getCallId()); + return call1.getId().equals(call2.getId()); } private void maybeStartSearch(Call call, boolean isPrimary) { @@ -274,7 +273,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> return; } if (entry.photo != null) { - if (mPrimary != null && callId.equals(mPrimary.getCallId())) { + if (mPrimary != null && callId.equals(mPrimary.getId())) { getUi().setPrimaryImage(entry.photo); } } @@ -492,7 +491,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } Log.i(this, "Swapping call to foreground: " + mSecondary); - TelecommAdapter.getInstance().unholdCall(mSecondary.getCallId()); + TelecommAdapter.getInstance().unholdCall(mSecondary.getId()); } public void endCallClicked() { @@ -501,7 +500,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } Log.i(this, "Disconnecting call: " + mPrimary); - TelecommAdapter.getInstance().disconnectCall(mPrimary.getCallId()); + TelecommAdapter.getInstance().disconnectCall(mPrimary.getId()); } public interface CallCardUi extends Ui { |