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

Commit d3218a16 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Fix 2g/3g toggle on UMTS networks 2nd try: already merged (I255359ba)... 

Merge "Fix 2g/3g toggle on UMTS networks 2nd try: already merged (I255359ba) but subsequently erased by Ib6a7e284" into froyo
parents dccd67a9 0e4bf60e

services/java/com/android/server/status/widget/NetworkModeButton.java

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public class NetworkModeButton extends PowerButton{ 
        switch(networkMode) {

            case Phone.NT_MODE_WCDMA_PREF:

            case Phone.NT_MODE_WCDMA_ONLY:

            case Phone.NT_MODE_GSM_UMTS:

                return PowerButton.STATE_ENABLED;

            case Phone.NT_MODE_GSM_ONLY:

                return PowerButton.STATE_DISABLED;
@@ -100,6 +101,7 @@ public class NetworkModeButton extends PowerButton{ 
        Intent intent = new Intent(MODIFY_NETWORK_MODE);

        switch (networkMode ) {

        case Phone.NT_MODE_WCDMA_PREF:

        case Phone.NT_MODE_GSM_UMTS:

            intent.putExtra(NETWORK_MODE, Phone.NT_MODE_GSM_ONLY);

            currentInternalState = PowerButton.STATE_TURNING_OFF;

            intendedNetworkMode=Phone.NT_MODE_GSM_ONLY;