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

Commit 473df1cd authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb 

* commit 'f7784876':
  Fix data network type notifications.
parents 12a8c395 f7784876

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

+2 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,8 @@ final class CdmaServiceStateTracker extends ServiceStateTracker { 


        cdmaDataConnectionState = newCdmaDataConnectionState;

        networkType = newNetworkType;

        // this new state has been applied - forget it until we get a new new state

        newNetworkType = 0;



        newSS.setStateOutOfService(); // clean slate for next time

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

+3 −0
Original line number Diff line number Diff line
@@ -957,6 +957,9 @@ final class GsmServiceStateTracker extends ServiceStateTracker { 


        gprsState = newGPRSState;

        networkType = newNetworkType;

        // this new state has been applied - forget it until we get a new new state

        newNetworkType = 0;





        newSS.setStateOutOfService(); // clean slate for next time