Merge "Null check IMS calls in shouldDisconnectActiveCallOnAnswer" am: b40f09bceb am: 84835fe2d6 (50a1a205) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -2973,6 +2973,10 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		private boolean shouldDisconnectActiveCallOnAnswer(ImsCall activeCall,
		ImsCall incomingCall) {

		if (activeCall == null \|\| incomingCall == null) {
		return false;
		}

		if (!mDropVideoCallWhenAnsweringAudioCall) {
		return false;
		}