Merge "Fix a bug where conference call does not automatically resume." (23816107) · Commits · e / os / android_packages_services_Telecomm

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

+12 −2

Original line number	Diff line number	Diff line
		@@ -1313,6 +1313,16 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
		return count;
		}

		int getNumTopLevelCalls() {
		int count = 0;
		for (Call call : mCalls) {
		if (call.getParentCall() == null) {
		count++;
		}
		}
		return count;
		}

		Call getOutgoingCall() {
		return getFirstCallWithState(OUTGOING_CALL_STATES);
		}
		@@ -1582,7 +1592,7 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
		}

		// If only call in call list is held call it's also a foreground call
		if (mCalls.size() == 1 && call.getState() == CallState.ON_HOLD) {
		if (getNumTopLevelCalls() == 1 && call.getState() == CallState.ON_HOLD) {
		newForegroundCall = call;
		}

		@@ -1615,7 +1625,7 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx
		}

		// If only call in call list is held call it's also a foreground call
		if (mCalls.size() == 1 && call.getState() == CallState.ON_HOLD) {
		if (getNumTopLevelCalls() == 1 && call.getState() == CallState.ON_HOLD) {
		newForegroundCall = call;
		}