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

Merge "Merge "Hide VoicemailContract.setQuota()" into nyc-dev am: 4f2a1d0913 am: 93ad8c6b2f" into nyc-mr1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2016-05-20 01:14:58 +00:00
committed by Android (Google) Code Review
parent 4574c449e9 df858672ba
commit 48fcac0445
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -33058,7 +33058,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

1
api/system-current.txt
View File

@@ -35764,7 +35764,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

1
api/test-current.txt
View File

@@ -33135,7 +33135,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

9
core/java/android/provider/VoicemailContract.java
View File

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