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

Commit ce53c030 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android Git Automerger
Browse files

am 3926e3fb: am 3e59d689: Merge "Fixing unhold in CallsManager so it does not... 

am 3926e3fb: am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev

* commit '3926e3fb':
  Fixing unhold in CallsManager so it does not hold child calls.
parents ad807f14 3926e3fb

src/com/android/server/telecom/CallsManager.java

+2 −1
Original line number Diff line number Diff line
@@ -776,7 +776,8 @@ public final class CallsManager extends Call.ListenerBase { 
        } else {

            Log.d(this, "unholding call: (%s)", call);

            for (Call c : mCalls) {

                if (c != null && c.isAlive() && c != call) {

                // Only attempt to hold parent calls and not the individual children.

                if (c != null && c.isAlive() && c != call && c.getParentCall() == null) {

                    c.hold();

                }

            }