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

Commit 9258f353 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "API fix: Rename and clarify ProvisioningManager constants" am: ee30a546 am: f81357c4 

Change-Id: I935954d502174e32586df2e79b7f7dde5fe00c08
parents c552a6f9 f81357c4

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10177,8 +10177,8 @@ package android.telephony.ims { 
    field public static final int KEY_RCS_CAPABILITY_DISCOVERY_ENABLED = 17; // 0x11

    field public static final int KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC = 23; // 0x17

    field public static final int KEY_RCS_MAX_NUM_ENTRIES_IN_RCL = 22; // 0x16

    field public static final int KEY_RCS_PUBLISH_OFFLINE_AVAILABILITY_TIMER_SEC = 16; // 0x10

    field public static final int KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS = 21; // 0x15

    field public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16; // 0x10

    field public static final int KEY_RCS_PUBLISH_TIMER_SEC = 15; // 0xf

    field public static final int KEY_REGISTRATION_DOMAIN_NAME = 12; // 0xc

    field public static final int KEY_REGISTRATION_RETRY_BASE_TIME_SEC = 33; // 0x21

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3786,8 +3786,8 @@ package android.telephony.ims { 
    field public static final int KEY_RCS_CAPABILITY_DISCOVERY_ENABLED = 17; // 0x11

    field public static final int KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC = 23; // 0x17

    field public static final int KEY_RCS_MAX_NUM_ENTRIES_IN_RCL = 22; // 0x16

    field public static final int KEY_RCS_PUBLISH_OFFLINE_AVAILABILITY_TIMER_SEC = 16; // 0x10

    field public static final int KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS = 21; // 0x15

    field public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16; // 0x10

    field public static final int KEY_RCS_PUBLISH_TIMER_SEC = 15; // 0xf

    field public static final int KEY_REGISTRATION_DOMAIN_NAME = 12; // 0xc

    field public static final int KEY_REGISTRATION_RETRY_BASE_TIME_SEC = 33; // 0x21

telephony/java/android/telephony/ImsManager.java

+3 −2
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ public class ImsManager { 
    private Context mContext;



    /**

     * <p>Broadcast Action: Indicates that an IMS operation was rejected by the network due to it

     * not being authorized on the network.

     * <p>Broadcast Action: Indicates that a previously allowed IMS operation was rejected by the

     * network due to the network returning a "forbidden" response. This may be due to a

     * provisioning change from the network.

     * May include the {@link SubscriptionManager#EXTRA_SUBSCRIPTION_INDEX} extra to also specify

     * which subscription the operation was rejected for.

     * <p class="note">

telephony/java/android/telephony/ims/ProvisioningManager.java

+16 −10
Original line number Diff line number Diff line
@@ -306,13 +306,13 @@ public class ProvisioningManager { 


    /**

     * An integer key associated with the carrier configured expiration time in seconds for

     * RCS presence published offline availability in RCS presence.

     * published offline availability in RCS presence provided, which is provided to the network.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)

     * @see #getProvisioningIntValue(int)

     */

    public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16;

    public static final int KEY_RCS_PUBLISH_OFFLINE_AVAILABILITY_TIMER_SEC = 16;



    /**

     * An integer key associated with whether or not capability discovery is provisioned for this
@@ -327,8 +327,10 @@ public class ProvisioningManager { 
    public static final int KEY_RCS_CAPABILITY_DISCOVERY_ENABLED = 17;



    /**

     * An integer key associated with the period of time the capability information of each contact

     * is cached on the device.

     * An integer key associated with the period of time in seconds the capability information of

     * each contact is cached on the device.

     * <p>

     * Seconds are used because this is usually measured in the span of days.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)
@@ -338,7 +340,8 @@ public class ProvisioningManager { 


    /**

     * An integer key associated with the period of time in seconds that the availability

     * information of a contact is cached on the device.

     * information of a contact is cached on the device, which is based on the carrier provisioning

     * configuration from the network.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)
@@ -348,7 +351,8 @@ public class ProvisioningManager { 


    /**

     * An integer key associated with the carrier configured interval in seconds expected between

     * successive capability polling attempts.

     * successive capability polling attempts, which is based on the carrier provisioning

     * configuration from the network.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)
@@ -358,7 +362,7 @@ public class ProvisioningManager { 


    /**

     * An integer key representing the minimum time allowed between two consecutive presence publish

     * messages from the device.

     * messages from the device in milliseconds.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)
@@ -379,7 +383,7 @@ public class ProvisioningManager { 
    /**

     * An integer associated with the expiration timer used during the SIP subscription of a

     * Request Contained List (RCL), which is used to retrieve the RCS capabilities of the contact

     * book.

     * book. This timer value is sent in seconds to the network.

     * <p>

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)
@@ -471,7 +475,8 @@ public class ProvisioningManager { 
    public static final int KEY_SIP_KEEP_ALIVE_ENABLED = 32;



    /**

     * Registration retry Base Time value in seconds.

     * Registration retry Base Time value in seconds, which is based off of the carrier

     * configuration.

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)

     * @see #getProvisioningIntValue(int)
@@ -479,7 +484,8 @@ public class ProvisioningManager { 
    public static final int KEY_REGISTRATION_RETRY_BASE_TIME_SEC = 33;



    /**

     * Registration retry Max Time value in seconds.

     * Registration retry Max Time value in seconds, which is based off of the carrier

     * configuration.

     * Value is in Integer format.

     * @see #setProvisioningIntValue(int, int)

     * @see #getProvisioningIntValue(int)

telephony/java/com/android/ims/ImsConfig.java

+3 −2
Original line number Diff line number Diff line
@@ -270,11 +270,12 @@ public class ImsConfig { 
        /**

         * Requested expiration for Published Offline availability.

         * Value is in Integer format.

         * @deprecated use {@link ProvisioningManager#KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC}.

         * @deprecated use

         *     {@link ProvisioningManager#KEY_RCS_PUBLISH_OFFLINE_AVAILABILITY_TIMER_SEC}.

         */

        @Deprecated

        public static final int PUBLISH_TIMER_EXTENDED =

                ProvisioningManager.KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC;

                ProvisioningManager.KEY_RCS_PUBLISH_OFFLINE_AVAILABILITY_TIMER_SEC;



        /**

         *