Merge "GsmCdmaPhone: don't crash without calling" into main (5a2f6952) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1119,6 +1119,7 @@ public class GsmCdmaPhone extends Phone {

		@Override
		public GsmCdmaCall getForegroundCall() {
		if (!hasCalling()) return null;
		return mCT.mForegroundCall;
		}

		@@ -1396,6 +1397,8 @@ public class GsmCdmaPhone extends Phone {

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public boolean isInCall() {
		if (!hasCalling()) return false;

		GsmCdmaCall.State foregroundCallState = getForegroundCall().getState();
		GsmCdmaCall.State backgroundCallState = getBackgroundCall().getState();
		GsmCdmaCall.State ringingCallState = getRingingCall().getState();