Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
437,097 Commits 3 Branches 0 Tags
da22ddac87d1105afaf2a2c58d5ca68d02b8fb49
Commit Graph

7197 Commits

Author SHA1 Message Date
Chen Xu
da22ddac87 Merge "expose systemAPI for SmsCbLocation constructor" 
am: 174b988133

Change-Id: Id44432a314e2becf72818f445120dbbe8367f9bc
 2019-11-21 09:49:17 -08:00
Chen Xu
174b988133 Merge "expose systemAPI for SmsCbLocation constructor" 2019-11-21 17:38:41 +00:00
Jack Yu
7b76848f90 Merge "SubscriptionManager: Cache created resources" 
am: f91923ff9d

Change-Id: I783003109debfaac5afabf8cd977c7e4c1a39eca
 2019-11-20 17:13:46 -08:00
Jack Yu
f91923ff9d Merge "SubscriptionManager: Cache created resources" 2019-11-21 01:07:33 +00:00
Jack Yu
ccf305e76f Merge "telephony annotations part 2" 
am: 1a9f2d0e78

Change-Id: I99e956fc3766bbb585c7e7315142ee43de95ce23
 2019-11-20 17:02:30 -08:00
Chen Xu
2105a42191 expose systemAPI for SmsCbLocation constructor 
Bug: 135956699
Test: cts SmsCbLocationTest
Change-Id: I7b9c6fa453ee907aaa13d65e0b13de0556852313
(cherry picked from commit 8635f37b96)
Merged-in: I7b9c6fa453ee907aaa13d65e0b13de0556852313
 2019-11-20 15:53:02 -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
Meng Wang
910d4e982a Merge "Expose IMSI encryption info APIs as system API" 
am: 0209217e33

Change-Id: Iafce568b8ea8cfc5d499dc21b5bbdc738cbfd3fd
 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
c4bb6df605 Merge "isTetherApnRequired api rename as isTetheringApnRequired" 
am: 25ea00d059

Change-Id: Id6e9d123f2dfb627402f09e0a609413f7b487af1
 2019-11-20 02:11:20 -08:00
Torbjorn Eklund
f8899f0a5b SubscriptionManager: Cache created resources 
Optimize resource handling in SubscriptionManager by caching
Resources created in getResourcesForSubId.

Inspired by commit: f9a7ccc1be43459516f0df0fc7042b1bc0560dd2

Bug: 144051856
Test: Manual
Change-Id: Id6878f933f09f9e3df183ffe45bf60108038889d
 2019-11-20 10:59:59 +01:00
SongFerng Wang
25ea00d059 Merge "isTetherApnRequired api rename as isTetheringApnRequired" 2019-11-20 08:46:05 +00:00
Meng Wang
d641117588 Merge "Move RLog out of telephony module" 
am: 7622ccb5f0

Change-Id: I39257ab4ba819dcba7f56b207a4483937f5d54f5
 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
ca6995b7bc Merge "[RCS] Add initial RcsFeature type" 
am: 6cb5422c5b

Change-Id: Ifd264d67ce6901054b31f65981f4c736589f91f8
 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
5dc01f163a Merge "Add support for disconnecting outgoing calls for emergency calls" 
am: 252fcc7b27

Change-Id: I0f3d0a651b69e76de0ba3f3a473bd5bcbb4c4d35
 2019-11-19 15:39:32 -08:00
Jordan Liu
2ca04cf384 Merge "Expose Geometry, LatLng, and maxWaitDuration" 
am: e993fb8bb9

Change-Id: Ie8332c4a2b6ee5617b4313235932645cbb4f593d
 2019-11-19 15:35:35 -08:00
Brad Ebinger
f6b214da1c Merge "Reorder getFeatureState parameters to convention" 
am: e11ab258b9

Change-Id: I9b0671d59bb7503d0947d354a5e5030b20010cdb
 2019-11-19 15:31:34 -08:00
Chen Xu
550006b8f8 Merge "deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL" 
am: 04b9b718a5

Change-Id: I53213519b7702400713c9446e9b36a24f4e1fddf
 2019-11-19 15:18:12 -08:00
Treehugger Robot
252fcc7b27 Merge "Add support for disconnecting outgoing calls for emergency calls" 2019-11-19 22:44:18 +00: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
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
42d7faea52 Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" 
am: 3c397a6217

Change-Id: I87928d3760e884b7b0348f7bbedfdde4c5e8d623
 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
abfa4692f3 Merge "Remove unnecessary calling getApplicationContex()" 
am: 2cc5a85213

Change-Id: I7239300215f22d9cdd100ba66c7ad9f48f84ecee
 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)
Merged-in: Ic7124f30fae6faa482467fd9235ef6155854f589
 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
134df4649a Merge "Migrated message duplicate detection to cell broadcast service" 
am: c774ff0743

Change-Id: I615da6538c1575c6af11bcfddaf324caa8fa2142
 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
Jack Yu
c774ff0743 Merge "Migrated message duplicate detection to cell broadcast service" 2019-11-16 00:47:04 +00:00
Chen Xu
77e638be81 deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL 
deprecate KEY_CARRIER_FORCE_DISABLE_ETWS_CMAS_TEST_BOOL. This is
only used for cellbroadcast receiver and move to resource overlay
show_test_settings

Bug: 141579944
Bug: 62016498
Bug: 141772296
Test: Build
Change-Id: I64762d9d7e5857dd2a9da1de4fa99e505a034887
 2019-11-15 15:38:02 -08:00
Jayachandran Chinnakkannu
8dc9114a9d Merge "Expose the following as system APIs" 
am: 119d0fa9ac

Change-Id: I26c045e96b728ee70232f1ad4b7d3647c630dca7
 2019-11-15 00:16:34 -08:00
Jayachandran Chinnakkannu
3b1241b603 Merge "Expose the following ServiceState API as system APIs" 
am: f19833ca7b

Change-Id: Icd39f4d6a517d5adf654c50f9fd4fd2f631b3876
 2019-11-15 00:13:18 -08:00
Taesu Lee
8aa8783143 Remove unnecessary calling getApplicationContex() 
TODO: remove context argument from sendMultimediaMessage() and
downloadMultimediaMessage()
Test: build

Change-Id: Ief203065eb713cec200dbbc5ee9fd09825980d1b
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-11-15 16:22:50 +09:00
Jayachandran Chinnakkannu
119d0fa9ac Merge "Expose the following as system APIs" 2019-11-15 07:09:56 +00:00
Jayachandran Chinnakkannu
f19833ca7b Merge "Expose the following ServiceState API as system APIs" 2019-11-15 07:08:34 +00:00
SongFerngWang
8a90fc0811 isTetherApnRequired api rename as isTetheringApnRequired 
Bug: 144455789
Test: Build pass.
      atest TetheringConfigurationTest (PASS)

Change-Id: I9ab4c7b3aef0619046d7e3d711683dbe1f31bb50
 2019-11-15 14:50:52 +08:00
Jack Yu
15dc64993b Merge "Remove unnecessary class name" 
am: f628417ce9

Change-Id: I2e66be6251b2427543e7c8a1cf2daf0c01b23e89
 2019-11-14 22:06:02 -08:00
Jiashen Wang
e11d665aae Merge "Add public APIs for carrier apps" 
am: 89a1e85387

Change-Id: Ie299e00e7389f03ed455994f0492144ec8f7b27e
 2019-11-14 16:08:40 -08:00
Brad Ebinger
879097ecf2 Reorder getFeatureState parameters to convention 
Bug: 143653269
Test: atest CtsTelephonyTestCases FrameworksTelephonyTests
Merged-In: Ifd2739cd8e26c34e3e771a43661e0763929e7a6c
Change-Id: Ifd2739cd8e26c34e3e771a43661e0763929e7a6c
 2019-11-14 16:01:11 -08:00
Taesu Lee
e376b8ceaf Remove unnecessary class name 
Test: build

Change-Id: Iedea0615e5fac0346c890342001fdee35e670cba
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
 2019-11-14 15:49:31 -08:00
Jiashen Wang
89a1e85387 Merge "Add public APIs for carrier apps" 2019-11-14 23:47:38 +00:00