diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-10 20:13:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-10 20:13:25 +0000 |
| commit | 7ff347842fe5df33245834c44f08f347bda31cd0 (patch) | |
| tree | b5056c5f978cbc13d23352f8edfe8860204ff452 | |
| parent | 9fe2ba0e37987434cf54083d4cfe7281b2d3b1e2 (diff) | |
| parent | b6d4181adaf62af8b5f8d2187d3b02209f90884b (diff) | |
Merge "Reset restricted count on merge."
| -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 { |