diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-28 18:39:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-28 18:39:34 +0000 |
commit | 8753037d897eafa0b60291999273e723f8a347a5 (patch) | |
tree | cda008f86020f99d9a45ced0795aaf848e838c84 /InCallUI | |
parent | f0ab8dae956d9887a6582870c29f274b0157b4eb (diff) | |
parent | ceff4bb9c8e42f1a20a1706860787b5d30215b04 (diff) |
Merge "Fix "Unknown" label in conference calls." into lmp-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 9948c2172..b2a19ab53 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -20,6 +20,7 @@ import com.android.contacts.common.CallUtil; import android.content.Context; import android.net.Uri; +import android.telecomm.CallProperties; import android.telecomm.PhoneCapabilities; import android.telecomm.GatewayInfo; import android.telecomm.InCallService.VideoCall; @@ -315,13 +316,17 @@ public final class Call { return (capabilities == (capabilities & mTelecommCall.getDetails().getCallCapabilities())); } + private boolean hasProperty(int property) { + return property == (property & mTelecommCall.getDetails().getCallProperties()); + } + /** Gets the time when the call first became active. */ public long getConnectTimeMillis() { return mTelecommCall.getDetails().getConnectTimeMillis(); } public boolean isConferenceCall() { - return mChildCallIds != null && !mChildCallIds.isEmpty(); + return hasProperty(CallProperties.CONFERENCE); } public GatewayInfo getGatewayInfo() { |