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

Commit 7b19a434 authored by Xin Li's avatar Xin Li
Browse files

Merge ab/7061308 into stage. 

Bug: 180401296
Merged-In: I1c1476b3c802762798f30f7131b034b6e8a87d5e
Change-Id: I17410c021d4554ff089c3760eec796e684d3e6d6
parents a9d862f7 b669cc50

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ import android.telephony.PhoneNumberUtils; 
import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.ServiceState;





import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.internal.telephony.sip.SipPhone;

import com.android.internal.telephony.sip.SipPhone;

import com.android.telephony.Rlog;

import com.android.telephony.Rlog;
@@ -2083,7 +2084,13 @@ public class CallManager { 
                    if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)");

                    if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_NEW_RINGING_CONNECTION)");

                    Connection c = (Connection) ((AsyncResult) msg.obj).result;

                    Connection c = (Connection) ((AsyncResult) msg.obj).result;

                    int subId = c.getCall().getPhone().getSubId();

                    int subId = c.getCall().getPhone().getSubId();

                    if (getActiveFgCallState(subId).isDialing() || hasMoreThanOneRingingCall()) {

                    boolean incomingRejected = false;

                    if ((c.getPhoneType() == PhoneConstants.PHONE_TYPE_IMS)

                            && ((ImsPhoneConnection) c).isIncomingCallAutoRejected()) {

                        incomingRejected = true;

                    }

                    if ((getActiveFgCallState(subId).isDialing() || hasMoreThanOneRingingCall())

                            && (!incomingRejected)) {

                        try {

                        try {

                            Rlog.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            Rlog.d(LOG_TAG, "silently drop incoming call: " + c.getCall());

                            c.getCall().hangup();

                            c.getCall().hangup();

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -324,6 +324,8 @@ public class GsmCdmaPhone extends Phone { 
                EVENT_UICC_APPS_ENABLEMENT_SETTING_CHANGED, null, false);

                EVENT_UICC_APPS_ENABLEMENT_SETTING_CHANGED, null, false);





        loadTtyMode();

        loadTtyMode();



        CallManager.getInstance().registerPhone(this);

        logd("GsmCdmaPhone: constructor: sub = " + mPhoneId);

        logd("GsmCdmaPhone: constructor: sub = " + mPhoneId);

    }

    }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -354,7 +354,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 
                    log("onReceive : Updating mAllowEmergencyVideoCalls = " +

                    log("onReceive : Updating mAllowEmergencyVideoCalls = " +

                            mAllowEmergencyVideoCalls);

                            mAllowEmergencyVideoCalls);

                }

                }

            } else if (TelecomManager.ACTION_CHANGE_DEFAULT_DIALER.equals(intent.getAction())) {

            } else if (TelecomManager.ACTION_DEFAULT_DIALER_CHANGED.equals(intent.getAction())) {

                mDefaultDialerUid.set(getPackageUid(context, intent.getStringExtra(

                mDefaultDialerUid.set(getPackageUid(context, intent.getStringExtra(

                        TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME)));

                        TelecomManager.EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME)));

            }

            }
@@ -922,7 +922,7 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall { 




        IntentFilter intentfilter = new IntentFilter();

        IntentFilter intentfilter = new IntentFilter();

        intentfilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intentfilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        intentfilter.addAction(TelecomManager.ACTION_CHANGE_DEFAULT_DIALER);

        intentfilter.addAction(TelecomManager.ACTION_DEFAULT_DIALER_CHANGED);

        mPhone.getContext().registerReceiver(mReceiver, intentfilter);

        mPhone.getContext().registerReceiver(mReceiver, intentfilter);

        updateCarrierConfiguration(mPhone.getSubId());

        updateCarrierConfiguration(mPhone.getSubId());

src/java/com/android/internal/telephony/uicc/euicc/EuiccCard.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -1063,13 +1063,13 @@ public class EuiccCard extends UiccCard { 
                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_7, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_7, versionBytes);

                break;

                break;

            case DEV_CAP_NREPC:

            case DEV_CAP_NREPC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_8, versionBytes);

                break;

                break;

            case DEV_CAP_NR5GC:

            case DEV_CAP_NR5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_9, versionBytes);

                break;

                break;

            case DEV_CAP_EUTRAN5GC:

            case DEV_CAP_EUTRAN5GC:

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_11, versionBytes);

                devCapBuilder.addChildAsBytes(Tags.TAG_CTX_10, versionBytes);

                break;

                break;

            default:

            default:

                loge("Invalid device capability name: " + devCap);

                loge("Invalid device capability name: " + devCap);

src/java/com/android/internal/telephony/uicc/euicc/Tags.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -57,7 +57,6 @@ class Tags { 
    static final int TAG_CTX_8 = 0x88;

    static final int TAG_CTX_8 = 0x88;

    static final int TAG_CTX_9 = 0x89;

    static final int TAG_CTX_9 = 0x89;

    static final int TAG_CTX_10 = 0x8A;

    static final int TAG_CTX_10 = 0x8A;

    static final int TAG_CTX_11 = 0x8B;





    // Context tags for constructed (compound) types

    // Context tags for constructed (compound) types

    static final int TAG_CTX_COMP_0 = 0xA0;

    static final int TAG_CTX_COMP_0 = 0xA0;