From b6d4181adaf62af8b5f8d2187d3b02209f90884b Mon Sep 17 00:00:00 2001 From: wangqi Date: Fri, 7 Jul 2017 17:56:33 -0700 Subject: Reset restricted count on merge. This will prevent merged conference having participant with name as following: 1. Restrict and non-restriced "" "Restricted 2" 2. Two restricted number "Restricted 3" "Restricted 4" After the change it will become: case 1: "" "Restricted" case 2: "Restricted 1" "Restricted 2" Note: Unfortunately there isn't a way to relate the pre-merge restricted calls to the post-merge restricted calls. So "Restricted 2" is not necessary the one pre-merge. This also means reset is safe here for merge. Bug: 63315372 Test: manual PiperOrigin-RevId: 161267675 Change-Id: I2df16b6f9802932c06f0bdd62618c49f4e6e87a8 --- java/com/android/incallui/call/TelecomAdapter.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java') diff --git a/java/com/android/incallui/call/TelecomAdapter.java b/java/com/android/incallui/call/TelecomAdapter.java index 4fc9f81eb..005278bff 100644 --- a/java/com/android/incallui/call/TelecomAdapter.java +++ b/java/com/android/incallui/call/TelecomAdapter.java @@ -88,9 +88,13 @@ public class TelecomAdapter implements InCallServiceListener { List conferenceable = call.getConferenceableCalls(); if (!conferenceable.isEmpty()) { call.conference(conferenceable.get(0)); + // It's safe to clear restrict count for merge action. + DialerCall.clearRestrictedCount(); } else { if (call.getDetails().can(android.telecom.Call.Details.CAPABILITY_MERGE_CONFERENCE)) { call.mergeConference(); + // It's safe to clear restrict count for merge action. + DialerCall.clearRestrictedCount(); } } } else { -- cgit v1.2.3