Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ad8c6b authored by Ta-wei Yen's avatar Ta-wei Yen Committed by android-build-merger
Browse files

Merge "Hide VoicemailContract.setQuota()" into nyc-dev 

am: 4f2a1d09

* commit '4f2a1d09':
  Hide VoicemailContract.setQuota()

Change-Id: Ifc1365650a981130a376ef253e96331595475510
parents 621b68a2 4f2a1d09

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -33058,7 +33058,6 @@ package android.provider { 














  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    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 int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

























api/system-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -35764,7 +35764,6 @@ package android.provider {



























  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    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 int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

























api/test-current.txt



+0
−1




























Original line number
Diff line number
Diff line








@@ -33135,7 +33135,6 @@ package android.provider {



























  public static final class VoicemailContract.Status implements android.provider.BaseColumns {















    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 int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2















    field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1

























core/java/android/provider/VoicemailContract.java



+7
−2




























Original line number
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,













         * 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>















         */















        public static final String QUOTA_OCCUPIED = "quota_occupied";































        /**















         * 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>















         */















        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 occupied See {@link Status#QUOTA_OCCUPIED}















         * @param total See {@link Status#QUOTA_TOTAL}













         *













         * @hide















         */















        public static void setQuota(Context context, PhoneAccountHandle accountHandle, int occupied,















                int total) {