Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ff34784 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reset restricted count on merge."

parents 9fe2ba0e b6d4181a

java/com/android/incallui/call/TelecomAdapter.java

+4 −0
Original line number Diff line number Diff line
@@ -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 {