diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-11 07:30:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-11 07:30:26 +0000 |
| commit | d7380586250c1926a685636eedc5ad139657f95e (patch) | |
| tree | 67496cf4485559ded1a2b4b0c158380be0858656 /java/com/android/incallui/call/TelecomAdapter.java | |
| parent | 917a16680022efb427836b375c70f9ca51b3961e (diff) | |
| parent | 9ef68bd518def395a5b9cbc8b8d4646c9d27e8d6 (diff) | |
| download | android_packages_apps_Dialer-d7380586250c1926a685636eedc5ad139657f95e.tar.gz android_packages_apps_Dialer-d7380586250c1926a685636eedc5ad139657f95e.tar.bz2 android_packages_apps_Dialer-d7380586250c1926a685636eedc5ad139657f95e.zip | |
release-request-5ee66a34-3e58-4de0-ba73-1f49074ee497-for-git_oc-mr1-release-4169335 snap-temp-L20600000081126177
Change-Id: I040cac3494f4de79b5566189af14fe13607b2fdc
Diffstat (limited to 'java/com/android/incallui/call/TelecomAdapter.java')
| -rw-r--r-- | java/com/android/incallui/call/TelecomAdapter.java | 4 |
1 files changed, 4 insertions, 0 deletions
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<android.telecom.Call> 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 { |