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

Commit 969feb57 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Expose ImsConfig constants as part of API." am: 48f7f07d am: 7bb16100 

Change-Id: I1a7bcf699cb3f62f3cb555ad668c8a64345ebb18
parents 94a02dca 7bb16100

api/system-current.txt

+56 −0
Original line number Diff line number Diff line
@@ -10227,7 +10227,27 @@ 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_1X_EPDG_TIMER_SEC = 64; // 0x40

    field public static final int KEY_1X_THRESHOLD = 59; // 0x3b

    field public static final int KEY_AMR_BANDWIDTH_EFFICIENT_PAYLOAD_TYPE = 50; // 0x32

    field public static final int KEY_AMR_CODEC_MODE_SET_VALUES = 0; // 0x0

    field public static final int KEY_AMR_DEFAULT_ENCODING_MODE = 53; // 0x35

    field public static final int KEY_AMR_OCTET_ALIGNED_PAYLOAD_TYPE = 49; // 0x31

    field public static final int KEY_AMR_WB_BANDWIDTH_EFFICIENT_PAYLOAD_TYPE = 48; // 0x30

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

    field public static final int KEY_AMR_WB_OCTET_ALIGNED_PAYLOAD_TYPE = 47; // 0x2f

    field public static final int KEY_DTMF_NB_PAYLOAD_TYPE = 52; // 0x34

    field public static final int KEY_DTMF_WB_PAYLOAD_TYPE = 51; // 0x33

    field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19

    field public static final int KEY_ENABLE_SILENT_REDIAL = 6; // 0x6

    field public static final int KEY_LOCAL_BREAKOUT_PCSCF_ADDRESS = 31; // 0x1f

    field public static final int KEY_LTE_EPDG_TIMER_SEC = 62; // 0x3e

    field public static final int KEY_LTE_THRESHOLD_1 = 56; // 0x38

    field public static final int KEY_LTE_THRESHOLD_2 = 57; // 0x39

    field public static final int KEY_LTE_THRESHOLD_3 = 58; // 0x3a

    field public static final int KEY_MINIMUM_SIP_SESSION_EXPIRATION_TIMER_SEC = 3; // 0x3

    field public static final int KEY_MOBILE_DATA_ENABLED = 29; // 0x1d

    field public static final int KEY_MULTIENDPOINT_ENABLED = 65; // 0x41

    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
@@ -10237,16 +10257,52 @@ package android.telephony.ims { 
    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

    field public static final int KEY_REGISTRATION_RETRY_MAX_TIME_SEC = 34; // 0x22

    field public static final int KEY_RTP_SPEECH_END_PORT = 36; // 0x24

    field public static final int KEY_RTP_SPEECH_START_PORT = 35; // 0x23

    field public static final int KEY_RTT_ENABLED = 66; // 0x42

    field public static final int KEY_SIP_ACK_RECEIPT_WAIT_TIME_MS = 43; // 0x2b

    field public static final int KEY_SIP_ACK_RETRANSMIT_WAIT_TIME_MS = 44; // 0x2c

    field public static final int KEY_SIP_INVITE_ACK_WAIT_TIME_MS = 38; // 0x26

    field public static final int KEY_SIP_INVITE_CANCELLATION_TIMER_MS = 4; // 0x4

    field public static final int KEY_SIP_INVITE_REQUEST_TRANSMIT_INTERVAL_MS = 37; // 0x25

    field public static final int KEY_SIP_INVITE_RESPONSE_RETRANSMIT_INTERVAL_MS = 42; // 0x2a

    field public static final int KEY_SIP_INVITE_RESPONSE_RETRANSMIT_WAIT_TIME_MS = 39; // 0x27

    field public static final int KEY_SIP_KEEP_ALIVE_ENABLED = 32; // 0x20

    field public static final int KEY_SIP_NON_INVITE_REQUEST_RETRANSMISSION_WAIT_TIME_MS = 45; // 0x2d

    field public static final int KEY_SIP_NON_INVITE_REQUEST_RETRANSMIT_INTERVAL_MS = 40; // 0x28

    field public static final int KEY_SIP_NON_INVITE_RESPONSE_RETRANSMISSION_WAIT_TIME_MS = 46; // 0x2e

    field public static final int KEY_SIP_NON_INVITE_TRANSACTION_TIMEOUT_TIMER_MS = 41; // 0x29

    field public static final int KEY_SIP_SESSION_TIMER_SEC = 2; // 0x2

    field public static final int KEY_SMS_FORMAT = 13; // 0xd

    field public static final int KEY_SMS_OVER_IP_ENABLED = 14; // 0xe

    field public static final int KEY_SMS_PUBLIC_SERVICE_IDENTITY = 54; // 0x36

    field public static final int KEY_T1_TIMER_VALUE_MS = 7; // 0x7

    field public static final int KEY_T2_TIMER_VALUE_MS = 8; // 0x8

    field public static final int KEY_TF_TIMER_VALUE_MS = 9; // 0x9

    field public static final int KEY_TRANSITION_TO_LTE_DELAY_MS = 5; // 0x5

    field public static final int KEY_USE_GZIP_FOR_LIST_SUBSCRIPTION = 24; // 0x18

    field public static final int KEY_VIDEO_QUALITY = 55; // 0x37

    field public static final int KEY_VOICE_OVER_WIFI_ENABLED_OVERRIDE = 28; // 0x1c

    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_VOLTE_USER_OPT_IN_STATUS = 30; // 0x1e

    field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb

    field public static final int KEY_WIFI_EPDG_TIMER_SEC = 63; // 0x3f

    field public static final int KEY_WIFI_THRESHOLD_A = 60; // 0x3c

    field public static final int KEY_WIFI_THRESHOLD_B = 61; // 0x3d

    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 int SMS_FORMAT_3GPP = 1; // 0x1

    field public static final int SMS_FORMAT_3GPP2 = 0; // 0x0

    field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";

    field public static final String STRING_QUERY_RESULT_ERROR_NOT_READY = "STRING_QUERY_RESULT_ERROR_NOT_READY";

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

    field public static final int VIDEO_QUALITY_LOW = 0; // 0x0

  }















  public static class ProvisioningManager.Callback {

























api/test-current.txt



+56
−0




























Original line number
Diff line number
Diff line








@@ -3552,7 +3552,27 @@ 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_1X_EPDG_TIMER_SEC = 64; // 0x40













    field public static final int KEY_1X_THRESHOLD = 59; // 0x3b













    field public static final int KEY_AMR_BANDWIDTH_EFFICIENT_PAYLOAD_TYPE = 50; // 0x32













    field public static final int KEY_AMR_CODEC_MODE_SET_VALUES = 0; // 0x0













    field public static final int KEY_AMR_DEFAULT_ENCODING_MODE = 53; // 0x35













    field public static final int KEY_AMR_OCTET_ALIGNED_PAYLOAD_TYPE = 49; // 0x31













    field public static final int KEY_AMR_WB_BANDWIDTH_EFFICIENT_PAYLOAD_TYPE = 48; // 0x30













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













    field public static final int KEY_AMR_WB_OCTET_ALIGNED_PAYLOAD_TYPE = 47; // 0x2f













    field public static final int KEY_DTMF_NB_PAYLOAD_TYPE = 52; // 0x34













    field public static final int KEY_DTMF_WB_PAYLOAD_TYPE = 51; // 0x33















    field public static final int KEY_EAB_PROVISIONING_STATUS = 25; // 0x19













    field public static final int KEY_ENABLE_SILENT_REDIAL = 6; // 0x6













    field public static final int KEY_LOCAL_BREAKOUT_PCSCF_ADDRESS = 31; // 0x1f













    field public static final int KEY_LTE_EPDG_TIMER_SEC = 62; // 0x3e













    field public static final int KEY_LTE_THRESHOLD_1 = 56; // 0x38













    field public static final int KEY_LTE_THRESHOLD_2 = 57; // 0x39













    field public static final int KEY_LTE_THRESHOLD_3 = 58; // 0x3a













    field public static final int KEY_MINIMUM_SIP_SESSION_EXPIRATION_TIMER_SEC = 3; // 0x3













    field public static final int KEY_MOBILE_DATA_ENABLED = 29; // 0x1d













    field public static final int KEY_MULTIENDPOINT_ENABLED = 65; // 0x41















    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









@@ -3562,16 +3582,52 @@ package android.telephony.ims {













    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













    field public static final int KEY_REGISTRATION_RETRY_MAX_TIME_SEC = 34; // 0x22













    field public static final int KEY_RTP_SPEECH_END_PORT = 36; // 0x24













    field public static final int KEY_RTP_SPEECH_START_PORT = 35; // 0x23













    field public static final int KEY_RTT_ENABLED = 66; // 0x42













    field public static final int KEY_SIP_ACK_RECEIPT_WAIT_TIME_MS = 43; // 0x2b













    field public static final int KEY_SIP_ACK_RETRANSMIT_WAIT_TIME_MS = 44; // 0x2c













    field public static final int KEY_SIP_INVITE_ACK_WAIT_TIME_MS = 38; // 0x26













    field public static final int KEY_SIP_INVITE_CANCELLATION_TIMER_MS = 4; // 0x4













    field public static final int KEY_SIP_INVITE_REQUEST_TRANSMIT_INTERVAL_MS = 37; // 0x25













    field public static final int KEY_SIP_INVITE_RESPONSE_RETRANSMIT_INTERVAL_MS = 42; // 0x2a













    field public static final int KEY_SIP_INVITE_RESPONSE_RETRANSMIT_WAIT_TIME_MS = 39; // 0x27













    field public static final int KEY_SIP_KEEP_ALIVE_ENABLED = 32; // 0x20













    field public static final int KEY_SIP_NON_INVITE_REQUEST_RETRANSMISSION_WAIT_TIME_MS = 45; // 0x2d













    field public static final int KEY_SIP_NON_INVITE_REQUEST_RETRANSMIT_INTERVAL_MS = 40; // 0x28













    field public static final int KEY_SIP_NON_INVITE_RESPONSE_RETRANSMISSION_WAIT_TIME_MS = 46; // 0x2e













    field public static final int KEY_SIP_NON_INVITE_TRANSACTION_TIMEOUT_TIMER_MS = 41; // 0x29













    field public static final int KEY_SIP_SESSION_TIMER_SEC = 2; // 0x2













    field public static final int KEY_SMS_FORMAT = 13; // 0xd













    field public static final int KEY_SMS_OVER_IP_ENABLED = 14; // 0xe













    field public static final int KEY_SMS_PUBLIC_SERVICE_IDENTITY = 54; // 0x36















    field public static final int KEY_T1_TIMER_VALUE_MS = 7; // 0x7













    field public static final int KEY_T2_TIMER_VALUE_MS = 8; // 0x8













    field public static final int KEY_TF_TIMER_VALUE_MS = 9; // 0x9













    field public static final int KEY_TRANSITION_TO_LTE_DELAY_MS = 5; // 0x5













    field public static final int KEY_USE_GZIP_FOR_LIST_SUBSCRIPTION = 24; // 0x18













    field public static final int KEY_VIDEO_QUALITY = 55; // 0x37













    field public static final int KEY_VOICE_OVER_WIFI_ENABLED_OVERRIDE = 28; // 0x1c















    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_VOLTE_USER_OPT_IN_STATUS = 30; // 0x1e















    field public static final int KEY_VT_PROVISIONING_STATUS = 11; // 0xb













    field public static final int KEY_WIFI_EPDG_TIMER_SEC = 63; // 0x3f













    field public static final int KEY_WIFI_THRESHOLD_A = 60; // 0x3c













    field public static final int KEY_WIFI_THRESHOLD_B = 61; // 0x3d















    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 int SMS_FORMAT_3GPP = 1; // 0x1













    field public static final int SMS_FORMAT_3GPP2 = 0; // 0x0















    field public static final String STRING_QUERY_RESULT_ERROR_GENERIC = "STRING_QUERY_RESULT_ERROR_GENERIC";















    field public static final String STRING_QUERY_RESULT_ERROR_NOT_READY = "STRING_QUERY_RESULT_ERROR_NOT_READY";













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













    field public static final int VIDEO_QUALITY_LOW = 0; // 0x0















  }































  public static class ProvisioningManager.Callback {

































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



+506
−1


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+279
−57


























File changed.
Preview size limit exceeded, changes collapsed.