Changed the prototype for onCallMerged.

The removed parameter is never used and it actually doesn't make
much sense as the layer that calls this callback doesn't have
any sensible second call to return to the handlers.

Bug: 18056632
Change-Id: I4abe92c020f64692370d9ab309e0d12877bdbb06

parent ab884d1f

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1089,7 +1089,7 @@ public final class ImsPhoneCallTracker extends CallTracker {
		}

		@Override
		public void onCallMerged(ImsCall call, ImsCall newCall) {
		public void onCallMerged(ImsCall call) {
		if (DBG) log("onCallMerged");

		mForegroundCall.merge(mBackgroundCall, mForegroundCall.getState());