diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-04-10 14:24:43 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-04-10 14:24:43 -0700 |
| commit | f41a78319650da5247005954e36cac98dc165b25 (patch) | |
| tree | 0c01afdb2970407b41b206deb3fc8426f7e54785 /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
| parent | 91563ab5b7ccf422eb6e8aa38fdc31ccf4612b92 (diff) | |
| parent | 18c0feda76fe333f3db1bf7bd307458a9e6b6005 (diff) | |
Merge commit '8bef461' into merge_work
Change-Id: I4cfea114e24c0b0671e99118316ad839dafbe400
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 9e5c61155..bd3694339 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -326,7 +326,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> return false; } - return mPrimary.can(Details.CAPABILITY_MANAGE_CONFERENCE); + return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE) + && !mPrimary.isVideoCall(mContext); } private void setCallbackNumber() { |