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

Commit 5fcf15d7 authored by Shishir Agrawal's avatar Shishir Agrawal Committed by android-build-merger
Browse files

resolved conflicts for merge of 1d92343e to lmp-mr1-wfc-dev 

automerge: 90c8cf76

* commit '90c8cf76':
  DcTracker: Cleanup connections when IccRecords is destroyed.
parents 6fc38dd5 90c8cf76

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ public interface Phone { 
    static final String REASON_CONNECTED = "connected";

    static final String REASON_SINGLE_PDN_ARBITRATION = "SinglePdnArbitration";

    static final String REASON_DATA_SPECIFIC_DISABLED = "specificDisabled";

    static final String REASON_SIM_NOT_READY = "simNotReady";

    static final String REASON_IWLAN_AVAILABLE = "iwlanAvailable";



    // Used for band mode selection methods

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+10 −0
Original line number Diff line number Diff line
@@ -1551,6 +1551,14 @@ public final class DcTracker extends DcTrackerBase { 
        setupDataOnConnectableApns(Phone.REASON_SIM_LOADED);

    }



    private void onSimNotReady() {

        if (DBG) log("onSimNotReady");



        cleanUpAllConnections(true, Phone.REASON_SIM_NOT_READY);

        mAllApnSettings = null;

        mAutoAttachOnCreationConfig = false;

    }



    @Override

    protected void onSetDependencyMet(String apnType, boolean met) {

        // don't allow users to tweak hipri to work around default dependency not met
@@ -2794,6 +2802,8 @@ public final class DcTracker extends DcTrackerBase { 
                mIccRecords.set(newIccRecords);

                newIccRecords.registerForRecordsLoaded(

                        this, DctConstants.EVENT_RECORDS_LOADED, null);

            } else {

                onSimNotReady();

            }

        }

    }