Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev (3e59d689) · Commits · e / os / android_packages_services_Telecomm

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();
		}
		}