Merge "Conference call merge button visibility issue. (1/2)" into lmp-dev (c3f986b5) · Commits · e / os / android_packages_services_Telecomm

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -936,6 +936,10 @@ final class Call implements CreateConnectionResponse {
		void setConferenceableCalls(List<Call> conferenceableCalls) {
		mConferenceableCalls.clear();
		mConferenceableCalls.addAll(conferenceableCalls);

		for (Listener l : mListeners) {
		l.onConferenceableCallsChanged(this);
		}
		}

		List<Call> getConferenceableCalls() {