Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update TelephonyManager.WifiCallingChoices API

Browse Source 
This CL updates the order of the WifiCallingChoices values
to match the wifi_calling_choice_values resource.

Change-Id: Iaa643d7a70938877c760ff4a65f737a4c1c750da
This commit is contained in:
Sailesh Nepal
2014-02-11 22:54:58 -08:00
parent bdd484f6f2
commit 2cde710fe4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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);

7
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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.