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

Commit 360f5533 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 7b0339a8: Merge "No data icon switch seen between LTE to EHRPD Handover" into honeycomb-LTE 

* commit '7b0339a8':
  No data icon switch seen between LTE to EHRPD Handover
parents 3eb81b63 7b0339a8

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

+1 −9
Original line number Diff line number Diff line
@@ -290,13 +290,6 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        newSS.setStateOutOfService();

        mLteSS.setStateOutOfService();



        // TODO: 4G Tech Handoff

        // if (has4gHandoff) {

        // Message msg = phone.mDataConnectionTracker.obtainMessage(

        // DataConnectionTracker.EVENT_4G_TECHNOLOGY_CHANGE);

        // phone.mDataConnectionTracker.sendMessage(msg);

        // }



        if ((hasMultiApnSupport)

                && (phone.mDataConnectionTracker instanceof CdmaDataConnectionTracker)) {

            if (DBG) log("GsmDataConnectionTracker Created");
@@ -390,8 +383,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
            mDetachedRegistrants.notifyRegistrants();

        }



        if ((hasCdmaDataConnectionChanged || hasNetworkTypeChanged)

                && (phone.mDataConnectionTracker instanceof CdmaDataConnectionTracker)) {

        if ((hasCdmaDataConnectionChanged || hasNetworkTypeChanged)) {

            phone.notifyDataConnection();

        }