Commit Graph

11088 Commits

Author SHA1 Message Date
Hall Liu
0fdcbb8cfb Merge changes from topic "composer-final-integration" into sc-dev
* changes:
  Rename TelecomManager.EXTRA_INCOMING_PICTURE
  Add support for integrating call composer
2021-01-28 22:49:22 +00:00
James Lin
a8053430ae Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b am: 108a1933ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6be307948ed6bc4600294ec628585018be3cccde
2021-01-28 21:14:08 +00:00
James Lin
108a1933ca Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." am: 4548fab7d6 am: 795855ec7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550598

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If010dd634828edb03ecb115c7cdc42f3faade053
2021-01-28 21:06:35 +00:00
Hall Liu
a749abcead Add support for integrating call composer
* Minor bugfix in call log to handle USER_CURRENT
* add TelephonyLocalConnection that allows frameworks/opt/telephony to
call code (indirectly) in packages/services/Telephony

Bug: 177613111
Test: atest CallComposerTest

Merged-In: I602b51da6009c884364a026781ca3c160978fbd1
Change-Id: I61af7553b4b3d71fe87c86fca62941747d43ef55
2021-01-28 12:28:25 -08:00
James Lin
4548fab7d6 Merge "Expose the RCS UCE APIs for capabilities request with presence mechanism." 2021-01-28 19:35:54 +00:00
Daniel Bright
50d149ecc6 Merge "Add S-NSSAI" am: d7d4b0ca85 am: 97f11a3ab2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia91f2b4ad353e8bab68e01a857d3387e4b5a4c00
2021-01-27 21:54:13 +00:00
James.cf Lin
daaf205e18 Expose the RCS UCE APIs for capabilities request with presence mechanism.
The contact's capabilities request APIs are exposed to be the SystemAPI and add the CTS for these APIs.

Build: 174656329
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.RcsUceAdapterTest
Change-Id: Id8a3be587f200dfee8f7c6343ed771e7ac738568
2021-01-28 02:59:30 +08:00
Daniel Bright
d7d4b0ca85 Merge "Add S-NSSAI" 2021-01-27 18:48:54 +00:00
Hall Liu
eeb227a688 Merge "Correct name of roaming RTT config" am: b6622aeeb6 am: a083efc121 am: bd4e78b072
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia49cf8be4d1efd8b63846c39f94cf68937c0c5d2
2021-01-27 07:58:42 +00:00
Hall Liu
326df3e1c1 Merge "Allow carriers to configure RTT while roaming" am: 923d7d28d0 am: 36e819d95f am: 7f159d477f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b6a2503e38c27abb010073f6f1dcefd9af8e171
2021-01-27 07:50:44 +00:00
Hall Liu
bd4e78b072 Merge "Correct name of roaming RTT config" am: b6622aeeb6 am: a083efc121
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560151

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5565934a33c55dfaec1e2cf2f1192ae41f97ddb5
2021-01-26 23:11:09 +00:00
Hall Liu
7f159d477f Merge "Allow carriers to configure RTT while roaming" am: 923d7d28d0 am: 36e819d95f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43ecce89c03cb33969f489c082684d3c5c0e56a3
2021-01-26 23:03:30 +00:00
Hall Liu
b6622aeeb6 Merge "Correct name of roaming RTT config" 2021-01-26 22:26:56 +00:00
Daniel Bright
dd7a9031eb Add S-NSSAI
* Added support for S-NSSAI
* Created SliceInfo that represents a S-NSSAI as defined in
  3GPP TS 24.501.
* Added slice info to setupDataCall and DataCallResponse within
  DataService related classes

Bug: 169960538
Test: made ims phone call
Change-Id: I8f136937f127ff14fedd790526544d5775010da8
Merged-In: I8f136937f127ff14fedd790526544d5775010da8
2021-01-26 13:53:58 -08:00
Hall Liu
7a18070979 Correct name of roaming RTT config
Add _bool to the end

Bug: 168676696
Test: manual
Change-Id: Ifa14d742d40a585ecc1e041088f49aa5d13df07b
2021-01-26 10:51:11 -08:00
SongFerng Wang
816ef2dde1 Merge "Add getPhoneCapability function in TelephonyManager" 2021-01-26 07:46:55 +00:00
SongFerngWang
13d5297155 Add getPhoneCapability function in TelephonyManager
- Add a resource for Device's Nr information.
- Expose below as systemApi
  - getDeviceNrCapabilityBitmask()
  - getMaxActiveInternetData()
  - getMaxActivePacketSwitchedVoiceCalls()
Bug: 175711587
Test: atest TelephonyManager#testGetPhoneCapability
atest PhoneCapabilityTest
atest PhoneConfigurationManagerTest
atest CellularNetworkValidatorTest
atest PhoneSwitcherTest
atest TelephonyRegistryTest
atest PhoneCapabilityTest

Change-Id: Ide25344787c15b3a57a9e6621766ad02a906f12e
2021-01-26 09:24:28 +08:00
Allen Su
092004fc72 Merge "[RCS]Add getEncodedMessage() in SipMessage.java" am: 725e04e4f1 am: d5253e5321 am: 3d996ba7b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b8bdb27a93f78a4c98b5663a12aec4e96f489fc
2021-01-26 00:23:50 +00:00
Jordan Liu
b5dab85753 Merge "Add carrier config for carrier key" am: 11dff58d5e am: b24ba046ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8508d94fe93bca5034259926a7c60a05d6bc2990
2021-01-26 00:05:48 +00:00
Allen Su
3d996ba7b5 Merge "[RCS]Add getEncodedMessage() in SipMessage.java" am: 725e04e4f1 am: d5253e5321
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6272bf2debe4430ac9cde2e2a7a85f7f943ee62
2021-01-26 00:04:54 +00:00
Hall Liu
923d7d28d0 Merge "Allow carriers to configure RTT while roaming" 2021-01-25 23:03:02 +00:00
TreeHugger Robot
80320a92f1 Merge "Hide start and cancel handover from api surface" 2021-01-25 20:56:39 +00:00
Jordan Liu
11dff58d5e Merge "Add carrier config for carrier key" 2021-01-25 18:52:10 +00:00
Allen Su
725e04e4f1 Merge "[RCS]Add getEncodedMessage() in SipMessage.java" 2021-01-25 18:10:11 +00:00
SongFerng Wang
1581f4fc97 Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" 2021-01-23 07:41:10 +00:00
Hall Liu
d20b2a013b Allow carriers to configure RTT while roaming
Add a carrier config key that makes RTT supported even if roaming.

Fixes: 168676696
Test: manual
Change-Id: Ied2418cdec57d2d405d4ed0f0227a251ecd626cf
2021-01-22 16:16:23 -08:00
Jordan Liu
60173db15f Add carrier config for carrier key
Give carriers the option of including a backup IMSI encryption key as a
carrier config.

Bug: 175801497
Test: manual and atest TelephonyManagerTest
Change-Id: I89d88daf2022672bf27125baae0247b75638bb6e
Merged-In: I89d88daf2022672bf27125baae0247b75638bb6e
2021-01-22 15:22:44 -08:00
SongFerngWang
7d95185d46 Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType
- Add more reasons of allowed network type
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
- Add @systemApi for below
  - ALLOWED_NETWORK_TYPES_REASON_USER
  - ALLOWED_NETWORK_TYPES_REASON_POWER
  - ALLOWED_NETWORK_TYPES_REASON_CARRIER
  - setAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesForReason API
  - getAllowedNetworkTypesBitmask API
- Add Public for below
  - CARRIER_NR_AVAILABILITY_NONE
  - CARRIER_NR_AVAILABILITY_NSA
  - CARRIER_NR_AVAILABILITY_SA
  - KEY_CARRIER_NR_AVAILABILITY_INT
- @Deprecated API
  - setPreferredNetworkTypeBitmask
  - getPreferredNetworkTypeBitmask
  - setAllowedNetworkType
  - getAllowedNetworkType
- Add a new way to notify allowedNetworkType at PhoneStateListener
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT

Bug: 161434786
Test: atest TelephonyManagerTest#testSetAllowedNetworkTypesForReason
(PASS)
atest TelephonyManagerTest#\
testSetAllowedNetworkTypesForReason_moreReason
(PASS)
atest PhoneStateListenerTest#\
testOnAllowedNetworkTypesChangedByRegisterPhoneStateListener
(PASS)

Change-Id: I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd
2021-01-23 06:51:05 +08:00
Daniel Bright
fa78c56da8 Merge "Add Radio Interface Capabilities" am: e44156cfd6 am: c24ad90810
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522306

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18cccffb56b7c6fd1c056075c914634235457722
2021-01-22 20:58:28 +00:00
Jordan Liu
ac1f060651 Merge "Add carrier config for carrier key" 2021-01-22 19:43:08 +00:00
Daniel Bright
e44156cfd6 Merge "Add Radio Interface Capabilities" 2021-01-22 19:08:21 +00:00
Chalard Jean
98c9ac6d37 Merge "Add Qos Callback support" am: 8e39c04b56 am: d52695827d am: cc08384548
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0a123f16951c88cc5881fba8865fae822ba92f0
2021-01-22 14:52:58 +00:00
Chalard Jean
cc08384548 Merge "Add Qos Callback support" am: 8e39c04b56 am: d52695827d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d07d8e5bd5e0a40df7d7fa276bf0c1fed500ed1
2021-01-22 14:17:50 +00:00
jimsun
b710d27f38 Make ImsReasonInfo.CODE_NETWORK_CONGESTION public
Bug: 175370724
Test: Simulate call end reason from vendor code and check IMS call
      end reason is correctly mapped.
Change-Id: I12e7a0401a4eb74b66ef53ce789410a9bf7b9770
2021-01-22 08:32:32 +00:00
Daniel Bright
2cc8ead3d6 Add Qos Callback support
* Provide App Developers Qos related info associated to
  a bound socket through ConnectivityManager
* Qos sessions are generated and filtered by Network Agents
  and sent back through the Connectivity Service to the
  API consumer.
* The structure of the code within com.android.server
  is designed to support different types of filters in the
  the future.
* The first type of Qos Attributes are related to EPS
  Bearers in order support RCS.

Bug: 155176305
Test: Added to cts/NetworkAgentTest
Test: Added to ConnectivityServiceTest
Change-Id: I145dd065d9deeee449eb9695ab3f6c8556ee7c09
2021-01-21 20:14:52 -08:00
Sarah Chin
871566afab Merge "Update TelephonyDisplayInfo docs" am: a906fd5e14 am: 90b6c9def0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557000

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e12f5e374fd29601182e8b99250a91933a2556
2021-01-21 23:34:25 +00:00
Daniel Bright
fa862bc4aa Add Radio Interface Capabilities
* Introduces a set of capabilities specific for the radio interface
that are determined by the vendor and are then surfaced through
TelephonyManager.
* There are no capabilities yet defined and will come later in S

Test: Added cts, ran cts, and telephony tests
Bug: 163085807
Merged-In: I56713e05cbd5200baa2a3bc79f7f4b0d580ad2a1
Change-Id: Icbbfa056dc5280acdf53c142742f4e4b8d60229e
2021-01-21 14:35:44 -08:00
Sarah Chin
96bba0f57a Update TelephonyDisplayInfo docs
Explain how to get TelephonyDisplayInfo through TelephonyManager and
PhoneStateListener

Test: build
Fix: 158760752
Change-Id: Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a
Merged-In: Ia59efcf68c77d79be1a223f9fd6cbf3ec333478a
2021-01-21 13:11:16 -08:00
Nathan Harold
adbd077786 Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f42 am: 47e1305bd6 am: 66a873b567
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23928895de3898903191b0341947ab6de9a7c75a
2021-01-21 20:12:54 +00:00
Rambo Wang
46043a617c Merge "Support new APIs in TelephonyManager to set/clear signal update request" am: 32c30af109 am: da259eccfa am: 52c1eb1ace
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532512

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a066aecce6445f3ea5b9dda58b70a7467562919
2021-01-21 20:11:49 +00:00
Nathan Harold
66a873b567 Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" am: 2b79ba7f42 am: 47e1305bd6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fb6ff5923d029b367c754759f7b7deca7a63dfe
2021-01-21 19:31:21 +00:00
Rambo Wang
52c1eb1ace Merge "Support new APIs in TelephonyManager to set/clear signal update request" am: 32c30af109 am: da259eccfa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532512

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f47ec228c940bcf91ed93e078da137a713ee8c0
2021-01-21 19:31:00 +00:00
Jack Yu
bf23a1ecf5 Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev-plus-aosp am: 880c028103
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13371827

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cac2e30dd42e069a85b81b1f79019d43ce9470c
2021-01-21 19:22:33 +00:00
TreeHugger Robot
4bce01ebbb Merge "Add a new reason code for IMS call failed due to network congestion" into rvc-qpr-dev am: 572c7f769c am: 617e4570cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13351221

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5d151d977c27636be0ed6d2becc238b43413fa8
2021-01-21 19:20:51 +00:00
Jack Yu
880c028103 Merge "Enabled TEMP_NOT_METERED support for carriers" into rvc-qpr-dev-plus-aosp 2021-01-21 19:12:54 +00:00
Nathan Harold
2b79ba7f42 Merge "Revert "Revert "Fix permission on TM#isDataEnabled""" 2021-01-21 19:04:12 +00:00
TreeHugger Robot
617e4570cb Merge "Add a new reason code for IMS call failed due to network congestion" into rvc-qpr-dev am: 572c7f769c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13351221

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7977e10af0c615b69b34a0e32c8652a349a7d1a8
2021-01-21 18:56:27 +00:00
Sarah Chin
af54fe6b6d Merge "Update setSubscriptionOverride API to allow network types" 2021-01-21 18:28:18 +00:00
TreeHugger Robot
572c7f769c Merge "Add a new reason code for IMS call failed due to network congestion" into rvc-qpr-dev 2021-01-21 17:57:22 +00:00
Jack Yu
ea53b4ef65 Enabled TEMP_NOT_METERED support for carriers
Enabled TEMP_NOT_METERED support for carriers by default.

Bug: 176119724
Test: Manual
Change-Id: Ie0323a354c89abf1a0effa0b65cde3b4d010115e
2021-01-21 00:46:14 -08:00