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

Commit eb7763ef authored by Kazuhiro Ondo's avatar Kazuhiro Ondo Committed by John Huang
Browse files

DO NOT MERGE: Fix leak in SIM ready registrants 

SIM Ready registrants was keep growing after air plane mode
toggle or RIL recovery.

Bug: 5222722
Change-Id: Iac9fcb86f96f9e42440e641cd94736fed6f45813
parent 090df1dc

telephony/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
    CDMALTEPhone mCdmaLtePhone;



    private ServiceState  mLteSS;  // The last LTE state from Voice Registration

    private boolean mNeedToRegForSimLoaded = true;



    public CdmaLteServiceStateTracker(CDMALTEPhone phone) {

        super(phone);
@@ -71,7 +72,10 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
            isSubscriptionFromRuim = false;

            // Register SIM_RECORDS_LOADED dynamically.

            // This is to avoid confilct with RUIM_READY scenario)

            if (mNeedToRegForSimLoaded) {

                phone.mIccRecords.registerForRecordsLoaded(this, EVENT_SIM_RECORDS_LOADED, null);

                mNeedToRegForSimLoaded = false;

            }

            pollState();

            // Signal strength polling stops when radio is off.

            queueNextSignalStrengthPoll();