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

Merge "API fix: Rename and clarify ProvisioningManager constants" into rvc-dev

Browse Source
This commit is contained in:
Brad Ebinger
2020-03-09 22:51:53 +00:00
committed by Android (Google) Code Review
parent 469263a457 6b06c64627
commit 1084c52acf
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -12706,8 +12706,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

2
api/test-current.txt
View File

@@ -4299,8 +4299,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

5
telephony/java/android/telephony/ImsManager.java
View File

@@ -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">

26
telephony/java/android/telephony/ims/ProvisioningManager.java
View File

@@ -305,13 +305,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
@@ -326,8 +326,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)
@@ -337,7 +339,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)
@@ -347,7 +350,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)
@@ -357,7 +361,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)
@@ -378,7 +382,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)
@@ -470,7 +474,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)
@@ -478,7 +483,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)

5
telephony/java/com/android/ims/ImsConfig.java
View File

@@ -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;
/**
*