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

Commit 1a15b03f authored by John Wang's avatar John Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove APN type in notifyDataConnection."

parents 1352531d 343112fb

telephony/java/com/android/internal/telephony/PhoneBase.java

+2 −2
Original line number Diff line number Diff line
@@ -806,10 +806,10 @@ public abstract class PhoneBase extends Handler implements Phone { 
        mNotifier.notifyDataConnection(this, reason, apnType, getDataConnectionState(apnType));

    }



    public void notifyDataConnection() {

    public void notifyDataConnection(String reason) {

        String types[] = getActiveApnTypes();

        for (String apnType : types) {

            mNotifier.notifyDataConnection(this, null, apnType, getDataConnectionState(apnType));

            mNotifier.notifyDataConnection(this, reason, apnType, getDataConnectionState(apnType));

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        }



        if ((hasCdmaDataConnectionChanged || hasNetworkTypeChanged)) {

            phone.notifyDataConnection();

            phone.notifyDataConnection(null);

        }



        if (hasRoamingOn) {

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

+1 −1
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
        }



        if (hasCdmaDataConnectionChanged || hasNetworkTypeChanged) {

            phone.notifyDataConnection();

            phone.notifyDataConnection(null);

        }



        if (hasRoamingOn) {

telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 
        }



        if (hasRadioTechnologyChanged) {

            phone.notifyDataConnection(Phone.REASON_NW_TYPE_CHANGED, Phone.APN_TYPE_ALL);

            phone.notifyDataConnection(Phone.REASON_NW_TYPE_CHANGED);

        }



        if (hasRoamingOn) {