am 3a8eaf2d: [DS] Fix a bug about Sip incoming call screen do not show. (2f69c118) · Commits · e / os / android_packages_apps_Dialer

InCallUI/src/com/android/incallui/ConferenceManagerPresenter.java

+13 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.content.Context;
		import com.android.incallui.InCallPresenter.InCallDetailsListener;
		import com.android.incallui.InCallPresenter.InCallState;
		import com.android.incallui.InCallPresenter.InCallStateListener;
		import com.android.incallui.InCallPresenter.IncomingCallListener;

		import com.google.common.base.Preconditions;

		@@ -32,7 +33,7 @@ import java.util.List;
		*/
		public class ConferenceManagerPresenter
		extends Presenter<ConferenceManagerPresenter.ConferenceManagerUi>
		implements InCallStateListener, InCallDetailsListener {
		implements InCallStateListener, InCallDetailsListener, IncomingCallListener {

		private Context mContext;

		@@ -42,6 +43,7 @@ public class ConferenceManagerPresenter

		// register for call state changes last
		InCallPresenter.getInstance().addListener(this);
		InCallPresenter.getInstance().addIncomingCallListener(this);
		}

		@Override
		@@ -49,6 +51,7 @@ public class ConferenceManagerPresenter
		super.onUiUnready(ui);

		InCallPresenter.getInstance().removeListener(this);
		InCallPresenter.getInstance().removeIncomingCallListener(this);
		}

		@Override
		@@ -90,6 +93,15 @@ public class ConferenceManagerPresenter
		}
		}

		@Override
		public void onIncomingCall(InCallState oldState, InCallState newState, Call call) {
		// When incoming call exists, set conference ui invisible.
		if (getUi().isFragmentVisible()) {
		Log.d(this, "onIncomingCall()... Conference ui is showing, hide it.");
		InCallPresenter.getInstance().showConferenceCallManager(false);
		}
		}

		public void init(Context context, CallList callList) {
		mContext = Preconditions.checkNotNull(context);
		mContext = context;