diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 414169f..a47267b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24512,6 +24512,7 @@ package android.telephony { method public java.lang.String getSubscriberId(); method public java.lang.String getVoiceMailAlphaTag(); method public java.lang.String getVoiceMailNumber(); + method public int getWhenToMakeWifiCalls(); method public boolean hasIccCard(); method public boolean iccCloseLogicalChannel(int); method public int iccOpenLogicalChannel(java.lang.String); 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. |