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
Tyler Gunn
d66d10525c
Merge "Add support for sending d2d messages through adb shell command." am: 7a58ad001b am: 0b333f92c1 am: 511997baab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I339559c8e459e644f24f041361b8798cbcbc4a7d
2021-01-26 00:22:16 +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
Tyler Gunn
511997baab
Merge "Add support for sending d2d messages through adb shell command." am: 7a58ad001b am: 0b333f92c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia2aad0e5f2830690cc09d234da8c5b40b1f30b6f
2021-01-26 00:03:52 +00:00
TreeHugger Robot
80320a92f1
Merge "Hide start and cancel handover from api surface"
2021-01-25 20:56:39 +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
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
Tyler Gunn
b6110a2158
Add support for sending d2d messages through adb shell command.
...
Adding in AIDL definition for sending test messages.
Test: Verified operation of the adb shell command which lets test message
be sent.
Bug: 163085177
Change-Id: I7b1c5398e2117077482a02ea4fec6c5d773ca3f5
2021-01-22 13:39:38 -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
Daniel Bright
72b973ba19
Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware" am: 2c8f0de95c am: 7c2815e531 am: f95800d6ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6b71a7d1779a7f8fa47150be0a8f2549188d61df
2021-01-21 06:22:27 +00:00
Zoey Chen
db3611e6ec
Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API" am: e61da845fa am: 388fa199cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553957
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I627f91a65c853537bc4ddd4f01c34e8ef59a9aa6
2021-01-21 06:04:40 +00:00
Daniel Bright
f95800d6ba
Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware" am: 2c8f0de95c am: 7c2815e531
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550421
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1ab384c510fba999d503a96ca2cc65e6760fad28
2021-01-21 06:02:54 +00:00
Rambo Wang
e86cb24b57
Support new APIs in TelephonyManager to set/clear signal update request
...
Introduce set/clearSignalStrengthUpdateRequest in TelephonyManager
and ITelephony to support customized signal request from applications.
Bug: 164432835
Test: atest android.telephony.cts.TelephonyManagerTest
Change-Id: I749376872915a91b9514884547140eaf969dba0e
2021-01-20 21:14:41 -08:00
Zoey Chen
e61da845fa
Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API"
2021-01-21 04:29:58 +00:00
Daniel Bright
2c8f0de95c
Merge "Make TelephonyManager#setImsRegistrationState multi-sim aware"
2021-01-21 04:10:27 +00:00
Amit Mahajan
a89a770cc4
Merge "Remove dup result code descriptions" am: 19ffdb0894 am: 649dcf3e0b am: 4ed77d37f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1163685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic06ed2a0e6d594e4231885635ab19e85953d06ac
2021-01-21 01:18:47 +00:00
Amit Mahajan
4ed77d37f9
Merge "Remove dup result code descriptions" am: 19ffdb0894 am: 649dcf3e0b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1163685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibd1c4cab0ad8ece17e732e78b8cd83d2780ad0ee
2021-01-21 00:59:54 +00:00
Amit Mahajan
19ffdb0894
Merge "Remove dup result code descriptions"
2021-01-20 22:19:23 +00:00
Jordan Liu
762fe4b0e0
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
2021-01-20 14:17:59 -08:00
Nathan Harold
cd08bb620d
Revert "Revert "Fix permission on TM#isDataEnabled""
...
This reverts commit 8ce575b256 .
Bug: 176163590
Bug: 148500541
Test: manual smoke test on low-end device and aosp_crosshatch builds.
Reason for revert: Reapplying with a fix for the exceptions.
The exceptions were caused by an undocumented behavior difference in the APIs that just blindly catch runtime exceptions. The cause of the runtime exceptions is that people are calling isDataEnabled() before telephony is running; however, until a "better" fix is available, this API will apply the existing behavior of just catching the runtime exceptions (which is terrible, but it's the plan of record in the code today).
Change-Id: I9fbe7126ee7039dfb0b383f83017458a3525db66
2021-01-20 21:30:55 +00:00
Daniel Bright
fd5dead7de
Make TelephonyManager#setImsRegistrationState multi-sim aware
...
Test: Ims call and unit tests
Bug: 167294783
Change-Id: Idb8f5ce7fe7592e94cb6202e7df133a354746388
2021-01-20 11:24:01 -08:00
Hall Liu
adcf909b5d
resolve merge conflicts of 869fe2b548 to rvc-qpr-dev-plus-aosp am: 6ef67bbd6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13371426
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7e40e7daabce0d44e436bed2b7ac6e3631df64a2
2021-01-20 18:52:34 +00:00
Hall Liu
6ef67bbd6c
resolve merge conflicts of 869fe2b548 to rvc-qpr-dev-plus-aosp
...
Change-Id: Ie60e988df7d0dc1a48bb85e8f5cdfccd549ff319
2021-01-20 01:10:40 +00:00
Hall Liu
942b71b485
Merge "IMS: Add new carrier config."
2021-01-19 22:36:43 +00:00
allenwtsu
227d47f9ec
[RCS]Add getEncodedMessage() in SipMessage.java
...
Test: atest
Bug: 177889282
Change-Id: Ib4b2da5b8c8bab490f00d87b785e87a74a2f6dfc
2021-01-19 21:48:15 +08:00
Jack Yu
1f610b73f3
Temporary fix to prevent TEMPORARILY_NOT_METERED leak
...
Currently we are seeing TEMPORARILY_NOT_METERED occurs on non-5G
devices. This fix adds more checks to prevent incorrect
TEMPORARILY_NOT_METERED being set. Before we root cause the issue,
we only allow this bit when all of the following conditions met.
1. Devices should support 5G.
2. Carriers should support 5G unmetered data.
3. Device should camp on 5G network.
This temporary fix should be removed after we root cause the issue.
Bug: 176119724
Test: Manual
Merged-In: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
Change-Id: I2b987d24851cdb16d8457b0ec5c546ace5485ed0
2021-01-19 07:48:56 +00:00
Rambo Wang
2ffea6d39d
Merge "Introduce SignalStrengthUpdateRequest to customize signal update request" am: 775a1db2c2 am: b581010b53 am: c7e48ceedf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532958
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8ad14ecc985b99dfc8c94f457d0f00b273743779
2021-01-19 00:02:51 +00:00
Oscar Shu
6740703701
Merge "CarrierConfig KEY_SUGGESTION_SSID_LIST_WITH_MAC_RANDOMIZATION_DISABLED"
2021-01-18 23:17:45 +00:00