Merge "Fix 2g/3g toggle on UMTS networks (the same fix has been already applied to Settings app power widget)" into froyo

1 files changed, 2 insertions, 0 deletions

diff --git a/services/java/com/android/server/status/widget/NetworkModeButton.java b/services/java/com/android/server/status/widget/NetworkModeButton.java
index b735448..885ab45 100755
--- a/services/java/com/android/server/status/widget/NetworkModeButton.java
+++ b/services/java/com/android/server/status/widget/NetworkModeButton.java
@@ -44,6 +44,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;
@@ -98,6 +99,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;