summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornadlabak <pavel@doshaska.net>2010-11-24 04:05:09 -0800
committernadlabak <pavel@doshaska.net>2010-11-24 04:05:09 -0800
commit0e4bf60e17c3da79c010dc787a5ae99bb3dd6db9 (patch)
tree042f97843f4743d58b829eedc2b430503ec32459
parentbf68c70453c19022f2ce2883a0fcadc475016f61 (diff)
downloadframeworks_base-0e4bf60e17c3da79c010dc787a5ae99bb3dd6db9.zip
frameworks_base-0e4bf60e17c3da79c010dc787a5ae99bb3dd6db9.tar.gz
frameworks_base-0e4bf60e17c3da79c010dc787a5ae99bb3dd6db9.tar.bz2
Fix 2g/3g toggle on UMTS networks
2nd try: already merged (I255359ba) but subsequently erased by Ib6a7e284 Change-Id: I21376f4c423d2b567a288db03cfb09c95d452eba
-rwxr-xr-xservices/java/com/android/server/status/widget/NetworkModeButton.java2
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 81becbe..40cd535 100755
--- a/services/java/com/android/server/status/widget/NetworkModeButton.java
+++ b/services/java/com/android/server/status/widget/NetworkModeButton.java
@@ -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;