Merge "Fix for glowpad not showing when dialing out + call waiting" into mnc-dev (1dd35118) · Commits · e / os / android_packages_apps_Dialer

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

+11 −13

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
		@Override
		public void onIncomingCall(InCallState oldState, InCallState newState, Call call) {
		Log.d(this, "onIncomingCall: " + this);
		if (getUi() != null) {
		Call modifyCall = CallList.getInstance().getVideoUpgradeRequestCall();
		if (modifyCall != null) {
		showAnswerUi(false);
		@@ -84,7 +83,6 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi>
		processIncomingCall(call);
		}
		}
		}

		@Override
		public void onIncomingCall(Call call) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -219,6 +219,9 @@ public class InCallPresenter implements CallList.Listener,
		mProximitySensor = proximitySensor;
		addListener(mProximitySensor);

		addIncomingCallListener(mAnswerPresenter);
		addInCallUiListener(mAnswerPresenter);

		mCallList = callList;

		// This only gets called by the service so this is okay.
		@@ -1556,8 +1559,6 @@ public class InCallPresenter implements CallList.Listener,
		* Private constructor. Must use getInstance() to get this singleton.
		*/
		private InCallPresenter() {
		addIncomingCallListener(mAnswerPresenter);
		addInCallUiListener(mAnswerPresenter);
		}

		/**