diff options
| author | 2015-06-24 17:58:26 +0000 | |
|---|---|---|
| committer | 2015-06-24 17:58:26 +0000 | |
| commit | 311509955aa521c673e09aa9035752eabf17eb4e (patch) | |
| tree | 5de1e86b63ab7f91db18b387f4fbb32f5d03b922 | |
| parent | 99c38d1c81ac1a43b6650c8de4aededfc236187b (diff) | |
| parent | e8bdaa9edf77ebfd64ec131dd53e7befe136d34b (diff) | |
am e8bdaa9e: am 8e0aab7d: Merge "Add public action to open voicemail settings." into mnc-dev
* commit 'e8bdaa9edf77ebfd64ec131dd53e7befe136d34b':
Add public action to open voicemail settings.
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index baa6c6779cd9..8d70a1e59e69 100644 --- a/api/current.txt +++ b/api/current.txt @@ -31123,6 +31123,7 @@ package android.telephony { method public boolean setOperatorBrandOverride(java.lang.String); method public boolean setPreferredNetworkTypeToGlobal(); method public boolean setVoiceMailNumber(java.lang.String, java.lang.String); + field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL"; field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; field public static final int CALL_STATE_IDLE = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index af50668ff3fd..5a08bc364010 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33386,6 +33386,7 @@ package android.telephony { method public int[] supplyPukReportResult(java.lang.String, java.lang.String); method public void toggleRadioOnOff(); method public void updateServiceLocation(); + field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL"; field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE"; field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE"; field public static final int CALL_STATE_IDLE = 0; // 0x0 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cec11cfd17d1..a2bd74b6d162 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -274,6 +274,13 @@ public class TelephonyManager { "android.telephony.action.EMERGENCY_ASSISTANCE"; /** + * Open the voicemail settings activity to make changes to voicemail configuration. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_CONFIGURE_VOICEMAIL = + "android.telephony.action.CONFIGURE_VOICEMAIL"; + + /** * @hide */ public static final boolean EMERGENCY_ASSISTANCE_ENABLED = false; |