Merge "Add more configuration state for visual voicemail" into nyc-mr1-dev (fbb87a05) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -33058,6 +33058,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";
		}
		@@ -33066,6 +33067,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;

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -35766,6 +35766,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";
		}
		@@ -35774,6 +35775,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;

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -33135,6 +33135,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";
		}
		@@ -33143,6 +33144,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;

core/java/android/provider/VoicemailContract.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -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}
		* <P>Type: INTEGER</P>
		*/
		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.