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

Merge "Add new @SystemApis for RCS dependencies" am: 6408fa473f am: dd840cdaae

Browse Source 
Change-Id: I307990e1b794a659b5110406794ba927d223be86
This commit is contained in:
Automerger Merge Worker
2020-01-14 18:17:11 +00:00
parent 7282ac170f dd840cdaae
commit f30c746b69
10 changed files with 289 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
api/system-current.txt
View File

@@ -9197,6 +9197,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
method public int getEmergencyNumberDbVersion();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimDomain();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String[] getIsimImpu();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getIsimIst();
method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.Map<java.lang.Integer,java.lang.Integer> getLogicalToPhysicalSlotMapping();
method public int getMaxNumberOfSimultaneouslyActiveSims();
@@ -9874,6 +9875,7 @@ package android.telephony.ims {
public class ImsManager {
method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
}
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
@@ -10175,8 +10177,22 @@ package android.telephony.ims {
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19
field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13
field public static final int KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC = 18; // 0x12
field public static final int KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC = 20; // 0x14
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_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_T1_TIMER_VALUE_MS = 7; // 0x7
field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b
field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a
field public static final int KEY_VOLTE_PROVISIONING_STATUS = 10; // 0xa
field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb
field public static final int PROVISIONING_RESULT_UNKNOWN = -1; // 0xffffffff
field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0
field public static final int PROVISIONING_VALUE_ENABLED = 1; // 0x1
field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";
@@ -10189,6 +10205,47 @@ package android.telephony.ims {
method public void onProvisioningStringChanged(int, @NonNull String);
}
public final class RcsContactUceCapability implements android.os.Parcelable {
method public int describeContents();
method @NonNull public java.util.List<java.lang.String> getCapableExtensionTags();
method @NonNull public android.net.Uri getContactUri();
method @Nullable public android.net.Uri getServiceUri(int);
method public boolean isCapable(int);
method public boolean isCapable(@NonNull String);
method public void writeToParcel(@NonNull android.os.Parcel, int);
field public static final int CAPABILITY_CHAT_SESSION = 2; // 0x2
field public static final int CAPABILITY_CHAT_SESSION_STORE_FORWARD = 4; // 0x4
field public static final int CAPABILITY_CHAT_STANDALONE = 1; // 0x1
field public static final int CAPABILITY_DISCOVERY_VIA_PRESENCE = 4096; // 0x1000
field public static final int CAPABILITY_FILE_TRANSFER = 8; // 0x8
field public static final int CAPABILITY_FILE_TRANSFER_HTTP = 64; // 0x40
field public static final int CAPABILITY_FILE_TRANSFER_SMS = 128; // 0x80
field public static final int CAPABILITY_FILE_TRANSFER_STORE_FORWARD = 32; // 0x20
field public static final int CAPABILITY_FILE_TRANSFER_THUMBNAIL = 16; // 0x10
field public static final int CAPABILITY_GEOLOCATION_PULL = 131072; // 0x20000
field public static final int CAPABILITY_GEOLOCATION_PULL_FILE_TRANSFER = 262144; // 0x40000
field public static final int CAPABILITY_GEOLOCATION_PUSH = 32768; // 0x8000
field public static final int CAPABILITY_GEOLOCATION_PUSH_SMS = 65536; // 0x10000
field public static final int CAPABILITY_IMAGE_SHARE = 256; // 0x100
field public static final int CAPABILITY_IP_VIDEO_CALL = 16384; // 0x4000
field public static final int CAPABILITY_IP_VOICE_CALL = 8192; // 0x2000
field public static final int CAPABILITY_RCS_VIDEO_CALL = 1048576; // 0x100000
field public static final int CAPABILITY_RCS_VIDEO_ONLY_CALL = 2097152; // 0x200000
field public static final int CAPABILITY_RCS_VOICE_CALL = 524288; // 0x80000
field public static final int CAPABILITY_SOCIAL_PRESENCE = 2048; // 0x800
field public static final int CAPABILITY_VIDEO_SHARE = 1024; // 0x400
field public static final int CAPABILITY_VIDEO_SHARE_DURING_CS_CALL = 512; // 0x200
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.RcsContactUceCapability> CREATOR;
}
public static class RcsContactUceCapability.Builder {
ctor public RcsContactUceCapability.Builder(@NonNull android.net.Uri);
method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int, @NonNull android.net.Uri);
method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(int);
method @NonNull public android.telephony.ims.RcsContactUceCapability.Builder add(@NonNull String);
method @NonNull public android.telephony.ims.RcsContactUceCapability build();
}
public interface RegistrationManager {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationState(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

15
api/test-current.txt
View File

@@ -3288,6 +3288,7 @@ package android.telephony.ims {
public class ImsManager {
method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
field public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION = "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
}
public class ImsMmTelManager implements android.telephony.ims.RegistrationManager {
@@ -3585,8 +3586,22 @@ package android.telephony.ims {
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public int setProvisioningStringValue(int, @NonNull String);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, boolean);
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public void unregisterProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.Callback);
field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19
field public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19; // 0x13
field public static final int KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC = 18; // 0x12
field public static final int KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC = 20; // 0x14
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_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_T1_TIMER_VALUE_MS = 7; // 0x7
field public static final int KEY_VOICE_OVER_WIFI_MODE_OVERRIDE = 27; // 0x1b
field public static final int KEY_VOICE_OVER_WIFI_ROAMING_ENABLED_OVERRIDE = 26; // 0x1a
field public static final int KEY_VOLTE_PROVISIONING_STATUS = 10; // 0xa
field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb
field public static final int PROVISIONING_RESULT_UNKNOWN = -1; // 0xffffffff
field public static final int PROVISIONING_VALUE_DISABLED = 0; // 0x0
field public static final int PROVISIONING_VALUE_ENABLED = 1; // 0x1
field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";

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

@@ -17,6 +17,8 @@
package android.telephony.ims;
import android.annotation.NonNull;
import android.annotation.SdkConstant;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.annotation.TestApi;
@@ -35,7 +37,26 @@ public class ImsManager {
private Context mContext;
/** @hide */
/**
* <p>Broadcast Action: Indicates that an IMS operation was rejected by the network due to it
* not being authorized on the network.
* May include the {@link SubscriptionManager#EXTRA_SUBSCRIPTION_INDEX} extra to also specify
* which subscription the operation was rejected for.
* <p class="note">
* Carrier applications may listen to this broadcast to be notified of possible IMS provisioning
* issues.
*/
// Moved from TelephonyIntents, need to keep backwards compatibility with OEM apps that have
// this value hard-coded in BroadcastReceiver.
@SuppressLint("ActionValue")
@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION =
"com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
/**
* Use {@link Context#getSystemService(String)} to get an instance of this class.
* @hide
*/
public ImsManager(@NonNull Context context) {
mContext = context;
}

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -4911,7 +4911,9 @@ public class TelephonyManager {
* not present or not loaded
* @hide
*/
@UnsupportedAppUsage
@Nullable
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public String[] getIsimImpu() {
try {
IPhoneSubInfo info = getSubscriberInfo();

1
telephony/java/android/telephony/ims/ImsRcsManager.java
View File

@@ -28,6 +28,7 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.telephony.AccessNetworkConstants;
import android.telephony.SubscriptionManager;
import android.telephony.ims.aidl.IImsCapabilityCallback;
import android.telephony.ims.aidl.IImsRcsController;
import android.telephony.ims.feature.ImsFeature;

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

@@ -85,6 +85,11 @@ public class ProvisioningManager {
public static final String STRING_QUERY_RESULT_ERROR_NOT_READY =
"STRING_QUERY_RESULT_ERROR_NOT_READY";
/**
* There is no existing configuration for the queried provisioning key.
*/
public static final int PROVISIONING_RESULT_UNKNOWN = -1;
/**
* The integer result of provisioning for the queried key is disabled.
*/
@@ -96,6 +101,151 @@ public class ProvisioningManager {
public static final int PROVISIONING_VALUE_ENABLED = 1;
// Inheriting values from ImsConfig for backwards compatibility.
/**
* An integer key representing the SIP T1 timer value in milliseconds for the associated
* subscription.
* <p>
* The SIP T1 timer is an estimate of the round-trip time and will retransmit
* INVITE transactions that are longer than T1 milliseconds over unreliable transports, doubling
* the time before retransmission every time there is no response. See RFC3261, section 17.1.1.1
* for more details.
* <p>
* The value is an integer.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_T1_TIMER_VALUE_MS = 7;
/**
* An integer key representing the voice over LTE (VoLTE) provisioning status for the
* associated subscription. Determines whether the user can register for voice services over
* LTE.
* <p>
* Use {@link #PROVISIONING_VALUE_ENABLED} to enable VoLTE provisioning and
* {@link #PROVISIONING_VALUE_DISABLED} to disable VoLTE provisioning.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_VOLTE_PROVISIONING_STATUS = 10;
/**
* An integer key representing the video telephony (VT) provisioning status for the
* associated subscription. Determines whether the user can register for video services over
* LTE.
* <p>
* Use {@link #PROVISIONING_VALUE_ENABLED} to enable VT provisioning and
* {@link #PROVISIONING_VALUE_DISABLED} to disable VT provisioning.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_VT_PROVISIONING_STATUS = 11;
/**
* An integer key associated with the carrier configured SIP PUBLISH timer, which dictates the
* expiration time in seconds for published online availability in RCS presence.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_PUBLISH_TIMER_SEC = 15;
/**
* An integer key associated with the carrier configured expiration time in seconds for
* RCS presence published offline availability in RCS presence.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC = 16;
/**
* An integer key associated with whether or not capability discovery is provisioned for this
* subscription. Any capability requests will be ignored by the RCS service.
* <p>
* The value is an integer, either {@link #PROVISIONING_VALUE_DISABLED} if capability
* discovery is disabled or {@link #PROVISIONING_VALUE_ENABLED} if capability discovery is
* enabled.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
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.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC = 18;
/**
* An integer key associated with the period of time in seconds that the availability
* information of a contact is cached on the device.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC = 19;
/**
* An integer key associated with the carrier configured interval in seconds expected between
* successive capability polling attempts.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC = 20;
/**
* An integer key representing the minimum time allowed between two consecutive presence publish
* messages from the device.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS = 21;
/**
* An integer key associated with the maximum number of MDNs contained in one SIP Request
* Contained List (RCS) used to retrieve the RCS capabilities of the contacts book.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_MAX_NUM_ENTRIES_IN_RCL = 22;
/**
* An integer associated with the expiration timer used duriing the SIP subscription of a
* Request Contained List (RCL), which is used to retrieve the RCS capabilities of the contact
* book.
* <p>
* Value is in Integer format.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC = 23;
/**
* An integer key representing the RCS enhanced address book (EAB) provisioning status for the
* associated subscription. Determines whether or not SIP OPTIONS or presence will be used to
* retrieve RCS capabilities for the user's contacts.
* <p>
* Use {@link #PROVISIONING_VALUE_ENABLED} to enable EAB provisioning and
* {@link #PROVISIONING_VALUE_DISABLED} to disable EAB provisioning.
* @see #setProvisioningIntValue(int, int)
* @see #getProvisioningIntValue(int)
*/
public static final int KEY_EAB_PROVISIONING_STATUS = 25;
/**
* Override the user-defined WiFi Roaming enabled setting for this subscription, defined in
* {@link SubscriptionManager#WFC_ROAMING_ENABLED_CONTENT_URI}, for the purposes of provisioning
@@ -264,7 +414,7 @@ public class ProvisioningManager {
*
* @param key An integer that represents the provisioning key, which is defined by the OEM.
* @return an integer value for the provided key, or
* {@link ImsConfigImplBase#CONFIG_RESULT_UNKNOWN} if the key doesn't exist.
* {@link #PROVISIONING_RESULT_UNKNOWN} if the key doesn't exist.
* @throws IllegalArgumentException if the key provided was invalid.
*/
@WorkerThread

14
telephony/java/android/telephony/ims/RcsContactUceCapability.java
View File

@@ -19,6 +19,7 @@ package android.telephony.ims;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
@@ -35,6 +36,7 @@ import java.util.Map;
* Contains the User Capability Exchange capabilities corresponding to a contact's URI.
* @hide
*/
@SystemApi
public final class RcsContactUceCapability implements Parcelable {
/** Supports 1-to-1 chat */
@@ -135,7 +137,7 @@ public final class RcsContactUceCapability implements Parcelable {
* @param type The capability to map to a service URI that is different from the contact's
* URI.
*/
public Builder add(@CapabilityFlag int type, @NonNull Uri serviceUri) {
public @NonNull Builder add(@CapabilityFlag int type, @NonNull Uri serviceUri) {
mCapabilities.mCapabilities |= type;
// Put each of these capabilities into the map separately.
for (int shift = 0; shift < Integer.SIZE; shift++) {
@@ -157,7 +159,7 @@ public final class RcsContactUceCapability implements Parcelable {
* Add a UCE capability flag that this contact supports.
* @param type the capability that the contact supports.
*/
public Builder add(@CapabilityFlag int type) {
public @NonNull Builder add(@CapabilityFlag int type) {
mCapabilities.mCapabilities |= type;
return this;
}
@@ -167,7 +169,7 @@ public final class RcsContactUceCapability implements Parcelable {
* @param extension A string containing a carrier specific service tag that is an extension
* of the {@link CapabilityFlag}s that are defined here.
*/
public Builder add(@NonNull String extension) {
public @NonNull Builder add(@NonNull String extension) {
mCapabilities.mExtensionTags.add(extension);
return this;
}
@@ -175,7 +177,7 @@ public final class RcsContactUceCapability implements Parcelable {
/**
* @return the constructed instance.
*/
public RcsContactUceCapability build() {
public @NonNull RcsContactUceCapability build() {
return mCapabilities;
}
}
@@ -205,7 +207,7 @@ public final class RcsContactUceCapability implements Parcelable {
}
}
public static final Creator<RcsContactUceCapability> CREATOR =
public static final @NonNull Creator<RcsContactUceCapability> CREATOR =
new Creator<RcsContactUceCapability>() {
@Override
public RcsContactUceCapability createFromParcel(Parcel in) {
@@ -219,7 +221,7 @@ public final class RcsContactUceCapability implements Parcelable {
};
@Override
public void writeToParcel(Parcel out, int flags) {
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeParcelable(mContactUri, 0);
out.writeInt(mCapabilities);
out.writeStringList(mExtensionTags);

4
telephony/java/android/telephony/ims/stub/ImsConfigImplBase.java
View File

@@ -23,6 +23,7 @@ import android.content.Context;
import android.os.PersistableBundle;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.telephony.ims.ProvisioningManager;
import android.telephony.ims.aidl.IImsConfig;
import android.telephony.ims.aidl.IImsConfigCallback;
import android.util.Log;
@@ -228,7 +229,8 @@ public class ImsConfigImplBase {
* The configuration requested resulted in an unknown result. This may happen if the
* IMS configurations are unavailable.
*/
public static final int CONFIG_RESULT_UNKNOWN = -1;
public static final int CONFIG_RESULT_UNKNOWN = ProvisioningManager.PROVISIONING_RESULT_UNKNOWN;
/**
* Setting the configuration value completed.
*/

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

@@ -178,7 +178,7 @@ public class ImsConfig {
* SIP T1 timer value in milliseconds. See RFC 3261 for define.
* Value is in Integer format.
*/
public static final int SIP_T1_TIMER = 7;
public static final int SIP_T1_TIMER = ProvisioningManager.KEY_T1_TIMER_VALUE_MS;
/**
* SIP T2 timer value in milliseconds. See RFC 3261 for define.
@@ -196,13 +196,15 @@ public class ImsConfig {
* VoLTE status for VLT/s status of Enabled (1), or Disabled (0).
* Value is in Integer format.
*/
public static final int VLT_SETTING_ENABLED = 10;
public static final int VLT_SETTING_ENABLED =
ProvisioningManager.KEY_VOLTE_PROVISIONING_STATUS;
/**
* VoLTE status for LVC/s status of Enabled (1), or Disabled (0).
* Value is in Integer format.
*/
public static final int LVC_SETTING_ENABLED = 11;
public static final int LVC_SETTING_ENABLED =
ProvisioningManager.KEY_VT_PROVISIONING_STATUS;
/**
* Domain Name for the device to populate the request URI for REGISTRATION.
* Value is in String format.
@@ -222,48 +224,56 @@ public class ImsConfig {
* Requested expiration for Published Online availability.
* Value is in Integer format.
*/
public static final int PUBLISH_TIMER = 15;
public static final int PUBLISH_TIMER = ProvisioningManager.KEY_RCS_PUBLISH_TIMER_SEC;
/**
* Requested expiration for Published Offline availability.
* Value is in Integer format.
*/
public static final int PUBLISH_TIMER_EXTENDED = 16;
public static final int PUBLISH_TIMER_EXTENDED =
ProvisioningManager.KEY_RCS_PUBLISH_TIMER_EXTENDED_SEC;
/**
*
* Value is in Integer format.
*/
public static final int CAPABILITY_DISCOVERY_ENABLED = 17;
public static final int CAPABILITY_DISCOVERY_ENABLED =
ProvisioningManager.KEY_RCS_CAPABILITY_DISCOVERY_ENABLED;
/**
* Period of time the capability information of the contact is cached on handset.
* Value is in Integer format.
*/
public static final int CAPABILITIES_CACHE_EXPIRATION = 18;
public static final int CAPABILITIES_CACHE_EXPIRATION =
ProvisioningManager.KEY_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC;
/**
* Peiod of time the availability information of a contact is cached on device.
* Value is in Integer format.
*/
public static final int AVAILABILITY_CACHE_EXPIRATION = 19;
public static final int AVAILABILITY_CACHE_EXPIRATION =
ProvisioningManager.KEY_RCS_AVAILABILITY_CACHE_EXPIRATION_SEC;
/**
* Interval between successive capabilities polling.
* Value is in Integer format.
*/
public static final int CAPABILITIES_POLL_INTERVAL = 20;
public static final int CAPABILITIES_POLL_INTERVAL =
ProvisioningManager.KEY_RCS_CAPABILITIES_POLL_INTERVAL_SEC;
/**
* Minimum time between two published messages from the device.
* Value is in Integer format.
*/
public static final int SOURCE_THROTTLE_PUBLISH = 21;
public static final int SOURCE_THROTTLE_PUBLISH =
ProvisioningManager.KEY_RCS_PUBLISH_SOURCE_THROTTLE_MS;
/**
* The Maximum number of MDNs contained in one Request Contained List.
* Value is in Integer format.
*/
public static final int MAX_NUMENTRIES_IN_RCL = 22;
public static final int MAX_NUMENTRIES_IN_RCL =
ProvisioningManager.KEY_RCS_MAX_NUM_ENTRIES_IN_RCL;
/**
* Expiration timer for subscription of a Request Contained List, used in capability
* polling.
* Value is in Integer format.
*/
public static final int CAPAB_POLL_LIST_SUB_EXP = 23;
public static final int CAPAB_POLL_LIST_SUB_EXP =
ProvisioningManager.KEY_RCS_CAPABILITY_POLL_LIST_SUB_EXP_SEC;
/**
* Applies compression to LIST Subscription.
* Value is in Integer format. Enable (1), Disable(0).
@@ -273,7 +283,8 @@ public class ImsConfig {
* VOLTE Status for EAB/s status of Enabled (1), or Disabled (0).
* Value is in Integer format.
*/
public static final int EAB_SETTING_ENABLED = 25;
public static final int EAB_SETTING_ENABLED =
ProvisioningManager.KEY_EAB_PROVISIONING_STATUS;
/**
* Wi-Fi calling roaming status.
* Value is in Integer format. ON (1), OFF(0).

7
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -18,6 +18,7 @@ package com.android.internal.telephony;
import android.content.Intent;
import android.telephony.SubscriptionManager;
import android.telephony.ims.ImsManager;
/**
* The intents that the telephony services broadcast.
@@ -223,9 +224,11 @@ public class TelephonyIntents {
* <p class="note">
* This is for the OEM applications to understand about possible provisioning issues.
* Used in OMA-DM applications.
* @deprecated Use {@link ImsManager#ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION} instead.
*/
public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION
= "com.android.internal.intent.action.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION";
@Deprecated
public static final String ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION =
ImsManager.ACTION_FORBIDDEN_NO_SERVICE_AUTHORIZATION;
/**
* Broadcast Action: A "secret code" has been entered in the dialer. Secret codes are