Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ad4ada3 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "IMS: Call Extras Propagation To Network" into mnc-dr-dev

parents 5c27d315 c02d6b7f

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

+16 −4
Original line number Original line Diff line number Diff line
@@ -434,10 +434,22 @@ public final class ImsPhoneCallTracker extends CallTracker { 
                    serviceType, callType);

                    serviceType, callType);

            profile.setCallExtraInt(ImsCallProfile.EXTRA_OIR, clirMode);

            profile.setCallExtraInt(ImsCallProfile.EXTRA_OIR, clirMode);





            if (intentExtras != null &&

            // Translate call subject intent-extra from Telecom-specific extra key to the

                    intentExtras.containsKey(android.telecom.TelecomManager.EXTRA_CALL_SUBJECT)) {

            // ImsCallProfile key.

                profile.setCallExtra(ImsCallProfile.EXTRA_DISPLAY_TEXT,

            if (intentExtras != null) {

                        intentExtras.getString(android.telecom.TelecomManager.EXTRA_CALL_SUBJECT));

                if (intentExtras.containsKey(android.telecom.TelecomManager.EXTRA_CALL_SUBJECT)) {

                    intentExtras.putString(ImsCallProfile.EXTRA_DISPLAY_TEXT,

                            intentExtras.getString(

                                    android.telecom.TelecomManager.EXTRA_CALL_SUBJECT));

                }



                // Pack the OEM-specific call extras.

                profile.mCallExtras.putBundle(ImsCallProfile.EXTRA_OEM_EXTRAS, intentExtras);



                // NOTE: Extras to be sent over the network are packed into the

                // intentExtras individually, with uniquely defined keys.

                // These key-value pairs are processed by IMS Service before

                // being sent to the lower layers/to the network.

            }

            }





            ImsCall imsCall = mImsManager.makeCall(mServiceId, profile,

            ImsCall imsCall = mImsManager.makeCall(mServiceId, profile,