Jack Yu
8782bfab97
Merge "telephony annotations part 2" am: 1a9f2d0e78
...
am: ccf305e76f
2019-11-20 17:06:27 -08:00
Jack Yu
ccf305e76f
Merge "telephony annotations part 2"
...
am: 1a9f2d0e78
2019-11-20 17:02:30 -08:00
Chen Xu
b6d1319d1a
telephony annotations part 2
...
adding missing annotations
Bug: 140908357
Test: Build
Merged-In: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
(cherry picked from commit f85cf993d3
2019-11-20 14:09:16 -08:00
Sooraj Sasindran
5f230a4c97
Merge "Add back off timer configs as carrier config" into qt-qpr1-dev
...
am: 772358beb6
2019-11-20 11:37:21 -08:00
Meng Wang
1fa4a358f3
Merge "Expose IMSI encryption info APIs as system API" am: 0209217e33
...
am: 910d4e982a
2019-11-20 10:14:24 -08:00
Meng Wang
910d4e982a
Merge "Expose IMSI encryption info APIs as system API"
...
am: 0209217e33
2019-11-20 10:07:06 -08:00
Meng Wang
0209217e33
Merge "Expose IMSI encryption info APIs as system API"
2019-11-20 17:57:08 +00:00
SongFerng Wang
1877b8226d
Merge "isTetherApnRequired api rename as isTetheringApnRequired" am: 25ea00d059
...
am: c4bb6df605
2019-11-20 02:18:08 -08:00
SongFerng Wang
c4bb6df605
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
...
am: 25ea00d059
2019-11-20 02:11:20 -08:00
SongFerng Wang
25ea00d059
Merge "isTetherApnRequired api rename as isTetheringApnRequired"
2019-11-20 08:46:05 +00:00
Meng Wang
99a254e353
Merge "Move GsmAlphabet to telephony/common" am: 36a15245e9
...
am: c68e65ed1a
2019-11-19 19:39:20 -08:00
Meng Wang
c68e65ed1a
Merge "Move GsmAlphabet to telephony/common"
...
am: 36a15245e9
2019-11-19 19:31:43 -08:00
Meng Wang
36a15245e9
Merge "Move GsmAlphabet to telephony/common"
2019-11-20 03:21:19 +00:00
Meng Wang
40c72efd32
Merge "Move RLog out of telephony module" am: 7622ccb5f0
...
am: d641117588
2019-11-19 18:20:52 -08:00
Meng Wang
d641117588
Merge "Move RLog out of telephony module"
...
am: 7622ccb5f0
2019-11-19 18:13:24 -08:00
Treehugger Robot
7622ccb5f0
Merge "Move RLog out of telephony module"
2019-11-20 01:59:18 +00:00
Allen Su
2c464dfd31
Merge "[RCS] Add initial RcsFeature type" am: 6cb5422c5b
...
am: ca6995b7bc
2019-11-19 17:56:46 -08:00
Allen Su
ca6995b7bc
Merge "[RCS] Add initial RcsFeature type"
...
am: 6cb5422c5b
2019-11-19 17:48:17 -08:00
Allen Su
6cb5422c5b
Merge "[RCS] Add initial RcsFeature type"
2019-11-20 01:38:21 +00:00
Meng Wang
78301b1563
Expose IMSI encryption info APIs as system API
...
Bug: 142431997
Test: make
Change-Id: I45ca070cfc59f4a7cc87d5d530b665d9259fcb71
Merged-In: I7bd15f225ac7774ac6e31c766ee0f11302aae3d8
2019-11-19 16:23:37 -08:00
Meng Wang
e88b4d2918
Move RLog out of telephony module
...
Bug: 144374158
Test: make
Change-Id: I7702677c8bb2529655ef03fc0a27c33743ae01b5
Merged-In: If983bc315218486be73567cd1919d1f60250f670
2019-11-19 16:16:08 -08:00
Brad Ebinger
dd1cd69743
Merge "Add support for disconnecting outgoing calls for emergency calls" am: 252fcc7b27
...
am: 5dc01f163a
2019-11-19 15:56:00 -08:00
Jordan Liu
f85b6a2def
Merge "Expose Geometry, LatLng, and maxWaitDuration" am: e993fb8bb9
...
am: 2ca04cf384
2019-11-19 15:51:19 -08:00
Brad Ebinger
d26ea8807f
Merge "Reorder getFeatureState parameters to convention" am: e11ab258b9
...
am: f6b214da1c
2019-11-19 15:47:43 -08:00
Brad Ebinger
5dc01f163a
Merge "Add support for disconnecting outgoing calls for emergency calls"
...
am: 252fcc7b27
2019-11-19 15:39:32 -08:00
Jordan Liu
2ca04cf384
Merge "Expose Geometry, LatLng, and maxWaitDuration"
...
am: e993fb8bb9
2019-11-19 15:35:35 -08:00
Brad Ebinger
f6b214da1c
Merge "Reorder getFeatureState parameters to convention"
...
am: e11ab258b9
2019-11-19 15:31:34 -08:00
Chen Xu
6f16f33d4c
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL" am: 04b9b718a5
...
am: 550006b8f8
2019-11-19 15:26:03 -08:00
Chen Xu
550006b8f8
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
...
am: 04b9b718a5
2019-11-19 15:18:12 -08:00
Hall Liu
ae63546d19
Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
...
am: dab3711435
2019-11-19 15:12:28 -08:00
Treehugger Robot
252fcc7b27
Merge "Add support for disconnecting outgoing calls for emergency calls"
2019-11-19 22:44:18 +00:00
Meng Wang
3312d7cfa7
Move GsmAlphabet to telephony/common
...
so it can be shared with non-telephony modules.
Test: make
Bug: 140908357
Change-Id: I8caba6a1ac3943e7f0044f7502eead10dfe8669c
2019-11-19 14:19:41 -08:00
Jordan Liu
e993fb8bb9
Merge "Expose Geometry, LatLng, and maxWaitDuration"
2019-11-19 20:55:36 +00:00
Hall Liu
dab3711435
Merge commit '1d7a53da981b7d4281c58af7eb9b150163b344a6' into manual_merge_1d7a53da981b7d4281c58af7eb9b150163b344a6
...
Change-Id: Ie08d8bb30e48a9e7ade85334c6195a791ecc0d9b
2019-11-19 12:37:24 -08:00
Sooraj Sasindran
74891f2730
Add back off timer configs as carrier config
...
Add time to determine as ping pong as a carrier config
Add max back off hysteresis time as a carrier config
Test: build
Bug: 143578171
Change-Id: I599aa88c4a8f29ca62aaa2948cc5c7f292b6a827
2019-11-19 12:00:47 -08:00
Brad Ebinger
e11ab258b9
Merge "Reorder getFeatureState parameters to convention"
2019-11-19 19:10:05 +00:00
Brad Ebinger
6271387650
Add support for disconnecting outgoing calls for emergency calls
...
1) Add CarrierConfig to allow/disallow holding calls for emergency
calls.
2) If holding an ongoing call for an emergency call is disallowed,
define a new DisconnectCause reason to notify telecom/dialer of this
disconnect reason.
Bug: 138741228
Test: atest CtsTelecomTestCases; atest CtsTelephonyTestCases
Change-Id: I7c6a1d0f648c598111ed047fbb9c609843c6aba9
2019-11-18 18:57:54 -08:00
Chen Xu
04b9b718a5
Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL"
2019-11-19 01:32:30 +00:00
Hall Liu
1d7a53da98
Merge changes from topic "mainline4"
...
* changes:
Add new API for Telecom to send phone state
Minor style correction to avoid merge conflict
non-mainline telephony related AIDL refactor/decoupling
2019-11-18 22:31:27 +00:00
Chen Xu
f08074d6ec
Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 3c397a6217
...
am: 42d7faea52
2019-11-18 11:23:06 -08:00
Chen Xu
42d7faea52
Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"
...
am: 3c397a6217
2019-11-18 11:16:54 -08:00
Chen Xu
3c397a6217
Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent"
2019-11-18 19:04:39 +00:00
Taesu Lee
592274ed2b
Merge "Remove unnecessary calling getApplicationContex()" am: 2cc5a85213
...
am: abfa4692f3
2019-11-18 01:15:58 -08:00
Taesu Lee
abfa4692f3
Merge "Remove unnecessary calling getApplicationContex()"
...
am: 2cc5a85213
2019-11-18 01:12:29 -08:00
Treehugger Robot
2cc5a85213
Merge "Remove unnecessary calling getApplicationContex()"
2019-11-18 08:59:31 +00:00
Chen Xu
39b95941f9
SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent
...
Bug: 135956699
Test: Build
Change-Id: Ic7124f30fae6faa482467fd9235ef6155854f589
(cherry picked from commit 9c1260c818
2019-11-16 09:21:33 -08:00
Jordan Liu
b3591333f7
Expose Geometry, LatLng, and maxWaitDuration
...
Expose Geometry and LatLng classes as SystemApi
Expose maxWaitDuration, which is used in the cell broadcast service
geofencing logic.
Bug: 135956699
Test: make and run appcompat script
Merged-In: Iac585cd54db97c08eccc57adc9721c90aa785fcd
Change-Id: Iac585cd54db97c08eccc57adc9721c90aa785fcd
(cherry picked from commit a8ec03ebe6
2019-11-16 07:56:30 -08:00
Jack Yu
9dfeec91dc
Merge "Migrated message duplicate detection to cell broadcast service" am: c774ff0743
...
am: 134df4649a
2019-11-15 22:08:05 -08:00
Jack Yu
134df4649a
Merge "Migrated message duplicate detection to cell broadcast service"
...
am: c774ff0743
2019-11-15 19:09:05 -08:00
Chen Xu
8eb62f9485
non-mainline telephony related AIDL refactor/decoupling
...
1. decouple IOnSubscriptionChangedListener AIDL from telephonyMainline
2. other refactor. moving APIs which will not be included in
telephony mainline to frameworks/base/core/java/android/telephony.
Moving internal classes like AIDL which will not be included in
telephony mainline to
framework/base/core/java/com/android/internal/telephony
Bug: 140908357
Test: Build & unit test
Change-Id: I9413ef758cceadd251d03f3b5ea1054cc48ef044
Merged-In: I9413ef758cceadd251d03f3b5ea1054cc48ef044
2019-11-15 18:02:40 -08:00
