From ceff4bb9c8e42f1a20a1706860787b5d30215b04 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Wed, 27 Aug 2014 16:39:34 -0700 Subject: Fix "Unknown" label in conference calls. Use properties instead of children for determining whether a call is a conference call. This makes solid sense, but is a smidgen theoretical; worked correctly for 10/10 when I just tested now. Bug: 17304243 Change-Id: I28dc948688b3c1fb85e2984bc77b5949cc730c2e --- InCallUI/src/com/android/incallui/Call.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'InCallUI') 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() { -- cgit v1.2.3