Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913... (427bfc08) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33065,7 +33065,6 @@ package android.provider {

	public static final class VoicemailContract.Status implements android.provider.BaseColumns {		public static final class VoicemailContract.Status implements android.provider.BaseColumns {
	method public static android.net.Uri buildSourceUri(java.lang.String);		method public static android.net.Uri buildSourceUri(java.lang.String);
	method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);
	field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";		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_CAN_BE_CONFIGURED = 2; // 0x2
	field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1		field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35771,7 +35771,6 @@ package android.provider {

	public static final class VoicemailContract.Status implements android.provider.BaseColumns {		public static final class VoicemailContract.Status implements android.provider.BaseColumns {
	method public static android.net.Uri buildSourceUri(java.lang.String);		method public static android.net.Uri buildSourceUri(java.lang.String);
	method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);
	field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";		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_CAN_BE_CONFIGURED = 2; // 0x2
	field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1		field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

api/test-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33142,7 +33142,6 @@ package android.provider {

	public static final class VoicemailContract.Status implements android.provider.BaseColumns {		public static final class VoicemailContract.Status implements android.provider.BaseColumns {
	method public static android.net.Uri buildSourceUri(java.lang.String);		method public static android.net.Uri buildSourceUri(java.lang.String);
	method public static void setQuota(android.content.Context, android.telecom.PhoneAccountHandle, int, int);
	field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";		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_CAN_BE_CONFIGURED = 2; // 0x2
	field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1		field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

core/java/android/provider/VoicemailContract.java

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -555,14 +555,17 @@ public class VoicemailContract {

	/**		/**
	* Amount of resource that is used by existing voicemail in the visual voicemail inbox,		* Amount of resource that is used by existing voicemail in the visual voicemail inbox,
	* or {@link #QUOTA_UNAVAILABLE}. Unit is not specified.		* or {@link #QUOTA_UNAVAILABLE} if the quota has never been updated before. This value is
			* used to inform the client the situation on the remote server. Unit is not specified.
	* <P>Type: INTEGER</P>		* <P>Type: INTEGER</P>
	*/		*/
	public static final String QUOTA_OCCUPIED = "quota_occupied";		public static final String QUOTA_OCCUPIED = "quota_occupied";

	/**		/**
	* Total resource in the visual voicemail inbox that can be used, or		* Total resource in the visual voicemail inbox that can be used, or
	* {@link #QUOTA_UNAVAILABLE}. Unit is not specified.		* {@link #QUOTA_UNAVAILABLE} if server either has unlimited quota or does not provide quota
			* information. This value is used to inform the client the situation on the remote server.
			* Unit is not specified.
	* <P>Type: INTEGER</P>		* <P>Type: INTEGER</P>
	*/		*/
	public static final String QUOTA_TOTAL = "quota_total";		public static final String QUOTA_TOTAL = "quota_total";
	@@ -620,6 +623,8 @@ public class VoicemailContract {
	* @param accountHandle The handle for the account the source is associated with.		* @param accountHandle The handle for the account the source is associated with.
	* @param occupied See {@link Status#QUOTA_OCCUPIED}		* @param occupied See {@link Status#QUOTA_OCCUPIED}
	* @param total See {@link Status#QUOTA_TOTAL}		* @param total See {@link Status#QUOTA_TOTAL}
			*
			* @hide
	*/		*/
	public static void setQuota(Context context, PhoneAccountHandle accountHandle, int occupied,		public static void setQuota(Context context, PhoneAccountHandle accountHandle, int occupied,
	int total) {		int total) {