summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2014-02-11 22:54:58 -0800
committerSailesh Nepal <sail@google.com>2014-02-11 22:54:58 -0800
commit2cde710fe42b706b368aec9b85f134f2d2452f7f (patch)
tree38d6bf179dc23af46ccaeb3ad1d56926117107bc /telephony
parentbdd484f6f263f44f31709b71c4d2843442fd830a (diff)
downloadframeworks_base-2cde710fe42b706b368aec9b85f134f2d2452f7f.zip
frameworks_base-2cde710fe42b706b368aec9b85f134f2d2452f7f.tar.gz
frameworks_base-2cde710fe42b706b368aec9b85f134f2d2452f7f.tar.bz2
Update TelephonyManager.WifiCallingChoices API
This CL updates the order of the WifiCallingChoices values to match the wifi_calling_choice_values resource. Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 5902b9c..ec1f1df 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -70,10 +70,10 @@ public class TelephonyManager {
public interface WifiCallingChoices {
/** Always use Wi-Fi calling */
static final int ALWAYS_USE = 0;
- /** Never use Wi-Fi calling */
- static final int NEVER_USE = 1;
/** Ask the user whether to use Wi-Fi on every call */
- static final int ASK_EVERY_TIME = 2;
+ static final int ASK_EVERY_TIME = 1;
+ /** Never use Wi-Fi calling */
+ static final int NEVER_USE = 2;
}
/** @hide */
@@ -1631,6 +1631,7 @@ public class TelephonyManager {
Rlog.e(TAG, "setRadioMode NPE", ex);
}
return false;
+ }
/*
* Obtain the current state of Wi-Fi calling.