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

Commit f4623e0e authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/35946115'] into 25Q4-release. 

Change-Id: Ib0bb46f307118a80c6364f1261182bef92e7d1e3
parents 2b5b47aa 71f1bcdc

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

+3 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ public class GsmCdmaPhone extends Phone { 
    private @ServiceState.RegState int mTelecomVoiceServiceStateOverride =

            ServiceState.STATE_OUT_OF_SERVICE;



    private CarrierKeyDownloadManager mCDM;

    private CarrierInfoManager mCIM;



    private final ImsManagerFactory mImsManagerFactory;
@@ -503,6 +504,8 @@ public class GsmCdmaPhone extends Phone { 
        mContext.registerReceiver(mBroadcastReceiver, filter,

                android.Manifest.permission.MODIFY_PHONE_STATE, null, Context.RECEIVER_EXPORTED);



        mCDM = new CarrierKeyDownloadManager(this);



        mCIM = new CarrierInfoManager();



        mCi.registerForImeiMappingChanged(this, EVENT_IMEI_MAPPING_CHANGED, null);