From 1121017213ca3a0761dd2128ffb0f48cb80acb36 Mon Sep 17 00:00:00 2001 From: Ta-wei Yen Date: Wed, 22 Jun 2016 17:48:52 -0700 Subject: Add more configuration state for visual voicemail Bug: 26944391 Change-Id: I7e0c2649097edca96d6a78fe2dc250a4b4855133 --- api/current.txt | 4 ++++ api/system-current.txt | 4 ++++ api/test-current.txt | 4 ++++ core/java/android/provider/VoicemailContract.java | 25 +++++++++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/api/current.txt b/api/current.txt index 1414fab1e464..f91edd4305c2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -33062,6 +33062,7 @@ package android.provider { field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; + field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; } @@ -33070,6 +33071,9 @@ package android.provider { method public static android.net.Uri buildSourceUri(java.lang.String); field public static final java.lang.String CONFIGURATION_STATE = "configuration_state"; field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2 + field public static final int CONFIGURATION_STATE_CONFIGURING = 3; // 0x3 + field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5 + field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4 field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1 field public static final int CONFIGURATION_STATE_OK = 0; // 0x0 field public static final android.net.Uri CONTENT_URI; diff --git a/api/system-current.txt b/api/system-current.txt index cb6ae795f932..cf720086af3a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -35770,6 +35770,7 @@ package android.provider { field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; + field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; } @@ -35778,6 +35779,9 @@ package android.provider { method public static android.net.Uri buildSourceUri(java.lang.String); field public static final java.lang.String CONFIGURATION_STATE = "configuration_state"; field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2 + field public static final int CONFIGURATION_STATE_CONFIGURING = 3; // 0x3 + field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5 + field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4 field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1 field public static final int CONFIGURATION_STATE_OK = 0; // 0x0 field public static final android.net.Uri CONTENT_URI; diff --git a/api/test-current.txt b/api/test-current.txt index 970ec19b1b13..0a92a56140d0 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -33139,6 +33139,7 @@ package android.provider { field public static final java.lang.String ACTION_NEW_VOICEMAIL = "android.intent.action.NEW_VOICEMAIL"; field public static final java.lang.String ACTION_SYNC_VOICEMAIL = "android.provider.action.SYNC_VOICEMAIL"; field public static final java.lang.String AUTHORITY = "com.android.voicemail"; + field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.provider.extra.PHONE_ACCOUNT_HANDLE"; field public static final java.lang.String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; field public static final java.lang.String PARAM_KEY_SOURCE_PACKAGE = "source_package"; } @@ -33147,6 +33148,9 @@ package android.provider { method public static android.net.Uri buildSourceUri(java.lang.String); field public static final java.lang.String CONFIGURATION_STATE = "configuration_state"; field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2 + field public static final int CONFIGURATION_STATE_CONFIGURING = 3; // 0x3 + field public static final int CONFIGURATION_STATE_DISABLED = 5; // 0x5 + field public static final int CONFIGURATION_STATE_FAILED = 4; // 0x4 field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1 field public static final int CONFIGURATION_STATE_OK = 0; // 0x0 field public static final android.net.Uri CONTENT_URI; diff --git a/core/java/android/provider/VoicemailContract.java b/core/java/android/provider/VoicemailContract.java index ab9e4971570a..27b0a8baf62b 100644 --- a/core/java/android/provider/VoicemailContract.java +++ b/core/java/android/provider/VoicemailContract.java @@ -152,6 +152,13 @@ public class VoicemailContract { */ public static final String EXTRA_SELF_CHANGE = "com.android.voicemail.extra.SELF_CHANGE"; + /** + * Extra included in {@link #ACTION_SYNC_VOICEMAIL} broadcast intents to indicate which {@link + * PhoneAccountHandle} to sync. + */ + public static final String EXTRA_PHONE_ACCOUNT_HANDLE = + "android.provider.extra.PHONE_ACCOUNT_HANDLE"; + /** * Name of the source package field, which must be same across all voicemail related tables. * This is an internal field. @@ -454,6 +461,9 @@ public class VoicemailContract { * {@link #CONFIGURATION_STATE_OK}, * {@link #CONFIGURATION_STATE_NOT_CONFIGURED}, * {@link #CONFIGURATION_STATE_CAN_BE_CONFIGURED} + * {@link #CONFIGURATION_STATE_CONFIGURING} + * {@link #CONFIGURATION_STATE_FAILED} + * {@link #CONFIGURATION_STATE_DISABLED} *

Type: INTEGER

*/ public static final String CONFIGURATION_STATE = "configuration_state"; @@ -472,6 +482,21 @@ public class VoicemailContract { * upgraded to visual voicemail and would like to show a set up invitation message. */ public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; + /** + * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail still is being + * configured. + */ + public static final int CONFIGURATION_STATE_CONFIGURING = 3; + /** + * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail has failed to + * be configured. + */ + public static final int CONFIGURATION_STATE_FAILED = 4; + /** + * Value of {@link #CONFIGURATION_STATE} to indicate that visual voicemail is disabled by + * the user. + */ + public static final int CONFIGURATION_STATE_DISABLED = 5; /** * The data channel state of the voicemail source. This the channel through which the source * pulls voicemail data from a remote server. -- cgit v1.2.3-59-g8ed1b