Commit Graph

7209 Commits

Author SHA1 Message Date
Chen Xu
302bd23a32 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-08 01:02:48 +00:00
Xiangyu/Malcolm Chen
ff3cf4315a Merge "Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED." 2019-10-07 22:53:09 +00:00
Sarah Chin
1018c95696 Merge "Add NETWORK_TYPE_NR to Telephony framework" 2019-10-07 19:17:27 +00:00
Sarah Chin
080b210f0e Add NETWORK_TYPE_NR to Telephony framework
Add NETWORK_CLASS_5_G to TelephonyManager
Add NR to ServiceState

Bug: 135421985
Test: atest FrameworksTelephonyTests
Change-Id: Iaed46354400c7a1ce410eebc246892d7edf448dc
2019-10-07 12:14:33 -07:00
Xiangyu/Malcolm Chen
ee1dd45893 Merge "Remove isActivePhoneId as it's moved to PhoneConfigurationManager." 2019-10-07 18:55:01 +00:00
Chen Xu
515285b1b5 move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage

Bug: 135956699
Bug: 141962867
Test: build & unit test
Change-Id: I07604101e3dccaa8e1539fa2644ef08da54d4533
2019-10-06 00:06:41 -07:00
Shuo Qian
c7eb6aa0bf Merge "Change the Listener API names" am: fe6978a73f am: 05430c9d1f am: bc79a1c468
am: b162d468fd

Change-Id: I2a124eee09111e3418e663faef0ff95266a3866f
2019-10-04 20:03:05 -07:00
Shuo Qian
b162d468fd Merge "Change the Listener API names" am: fe6978a73f am: 05430c9d1f
am: bc79a1c468

Change-Id: Ie1672f6e103dd59ee97b54681836d0e1fda7c2ae
2019-10-04 19:56:27 -07:00
Shuo Qian
05430c9d1f Merge "Change the Listener API names"
am: fe6978a73f

Change-Id: Icf860de451298632635ad15ba0d1c7701b83073e
2019-10-04 19:41:12 -07:00
Shuo Qian
d96637660f Change the Listener API names
Test: cts
Bug: 135204580
Change-Id: I1f64d6eb6b113ca85f43a3f6a578c68dbb8bd5ed
2019-10-04 13:24:23 -07:00
Jordan Liu
b6ac1d67bc Merge "Add CellBroadcastService and related permissions" 2019-10-04 18:03:04 +00:00
Shuo Qian
69657278ed Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0 am: 69eabb2397 am: bbcbf281d1
am: 07ac796568

Change-Id: I82b84cd3d74269fa3e381ff8d0c43a23fb061ea8
2019-10-04 09:57:05 -07:00
Shuo Qian
07ac796568 Merge "Add both Emergency Number listener for testing" am: 46cf71d1d0 am: 69eabb2397
am: bbcbf281d1

Change-Id: I864072e7c077ab95fd5619bfbccf0b3bee54e225
2019-10-04 09:39:50 -07:00
Shuo Qian
69eabb2397 Merge "Add both Emergency Number listener for testing"
am: 46cf71d1d0

Change-Id: I0973225c5125e0549757f609d52f58031e447f5d
2019-10-04 09:10:35 -07:00
Malcolm Chen
2460b19b00 Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
ACTION_MULTI_SIM_CONFIG_CHANGED will be sent when multi-SIM
variants change.

Bug: 141388730
Test: test app
Change-Id: I717482ea05571afdfe6b04318d3f1fbda0c177ed
2019-10-03 17:35:05 -07:00
Malcolm Chen
afe7d79964 Remove isActivePhoneId as it's moved to PhoneConfigurationManager.
Bug: 141388730
Test: unittest
Change-Id: Idf7babd3ad0bcbde04b2a92761acf31ec9776a50
2019-10-03 16:52:45 -07:00
Shuo Qian
650ff647e4 Add both Emergency Number listener for testing
Test: CTS
Bug: 135204580
Change-Id: Ifb20b9a20f9493fb7fe671c0fd2d8b4de7ea9f67
2019-10-03 15:09:00 -07:00
Jordan Liu
289dfd037f Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-03 14:56:52 -07:00
Chen Xu
d6b2673181 remove API RoleManager.getFinancialSms
getFinancialSms is not functional and not used today, thus
remove it to avoid future confusion

Bug: 138745655
Bug: 140908357
Test: atest android.telephony.cts.SmsManagerTest
Change-Id: Ib57d0fc189b6c894227894ee02b592f7ee46f22f
2019-10-03 14:37:53 -07:00
Chen Xu
fac787d7f2 Merge "telephony annotations part 2" 2019-10-03 18:15:17 +00:00
Jack Yu
4358ca81ed Merge "Added read phone state permission for getNetworkCountryIso" 2019-10-03 17:22:59 +00:00
Hall Liu
f99b67b657 Merge "Add carrier config for allowing merge of RTT calls" 2019-10-02 23:43:15 +00:00
Hall Liu
01e165a9ef Merge "Unbind MBMS service after calling close" am: d00563735f am: 657c80a322 am: a024eb5f9f
am: b1d94a9a7a

Change-Id: I54dfca8fac8bf60967f95f84ccb0e7defedb5699
2019-10-02 16:26:19 -07:00
Hall Liu
b1d94a9a7a Merge "Unbind MBMS service after calling close" am: d00563735f am: 657c80a322
am: a024eb5f9f

Change-Id: I31df21c47f15e9d2edd7f5b6e4b7bf6b9a6eb8a3
2019-10-02 15:41:20 -07:00
Hall Liu
657c80a322 Merge "Unbind MBMS service after calling close"
am: d00563735f

Change-Id: I9392f5d1c2922d373b0aef812cbc43ba1ef05848
2019-10-02 15:11:20 -07:00
Hall Liu
64a192b61f Add carrier config for allowing merge of RTT calls
Add a carrier config key that specifies whether merging an RTT call is
allowed.

Bug: 136035168
Test: manual

Change-Id: I8cfdf68c69b50abed88d7c835db0480a53755f5a
Merged-In: I8cfdf68c69b50abed88d7c835db0480a53755f5a
2019-10-02 21:56:57 +00:00
Hall Liu
d00563735f Merge "Unbind MBMS service after calling close" 2019-10-02 21:56:01 +00:00
Brad Ebinger
7c49b19c2f Merge "Add Telecom command for setting connectionservice filter" am: 25f4dca660 am: 05e03e8c0c am: 4d4dc1165a
am: 7acb9ff577

Change-Id: I2b4aa863848da2e0249c71577c55ecb0918a5ed0
2019-10-02 14:27:13 -07:00
James Lin
450c72984b Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" am: 74ad1b81ab am: 54e73b6e1a
am: 4099874d5c

Change-Id: I2b4cb5f4f1874b019753d46f9f58f5a85b6da7be
2019-10-02 14:15:48 -07:00
Jordan Liu
b550ae2a2c Merge "Expose CdmaSmsCbProgramData as SystemApi" am: e3dfe362dc am: 94d4fcb7b3
am: c6ac2a7ebe

Change-Id: I272e5ebb0b8697f68d0ea4df5f0a0b1f2fd3fadc
2019-10-02 14:10:31 -07:00
TreeHugger Robot
2b9c580af0 Merge "Move getMmsConfig from SmsManager to MmsService." 2019-10-02 21:05:17 +00:00
Brad Ebinger
7acb9ff577 Merge "Add Telecom command for setting connectionservice filter" am: 25f4dca660 am: 05e03e8c0c
am: 4d4dc1165a

Change-Id: Id7e2c0c4f6c18b074ba40d31dbb43ec2dfc269fc
2019-10-02 14:03:19 -07:00
Chen Xu
f85cf993d3 telephony annotations part 2
adding missing annotations

Bug: 140908357
Test: Build
Change-Id: I6de632ef7ef01a939971b7d1bacb227ec5ff4048
2019-10-02 13:48:50 -07:00
Xiangyu/Malcolm Chen
781630e4b4 Merge changes from topic "141388730"
* changes:
  In CarrierTextController replace getPhoneCount with getMaxPhoneCount.
  Replace getPhoneCount with getMaxPhoneCount upon object allocation.
2019-10-02 17:13:05 +00:00
James Lin
54e73b6e1a Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported"
am: 74ad1b81ab

Change-Id: I67c40753c0ae96893ed13e78f482782b4f67ccb2
2019-10-02 08:44:33 -07:00
James Lin
74ad1b81ab Merge "[RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported" 2019-10-02 15:26:22 +00:00
Hall Liu
718986d929 Unbind MBMS service after calling close
Add a call to Context#unbindService in close() in the three MBMS session
classes so that we don't get a service binding leak.
Also add implementations of onNullBinding.

Fixes: 140144741
Test: manual
Change-Id: Ibde9fdbc096decb7b6ab7b60016645bc4810b859
2019-10-01 16:52:47 -07:00
Jordan Liu
94d4fcb7b3 Merge "Expose CdmaSmsCbProgramData as SystemApi"
am: e3dfe362dc

Change-Id: I8ff5254d03558c69bc0cd8fd57a7337349de6be2
2019-10-01 13:51:51 -07:00
Jordan Liu
e3dfe362dc Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 20:33:29 +00:00
Chen Xu
4884beda8b Merge "new telephony annotation class" 2019-10-01 19:57:46 +00:00
James.cf Lin
9f5e1f7509 [RCS] Add carrier config "use_rcs_sip_options_bool" for check if SIP OPTIONS is supported
Bug: 139260798
Test: Manual
Change-Id: I93df866fe020d03130458175a8823368069c47e6
Merged-In: I875e597fa3cb5d7f5a93989d2ff8e4abbbd9d045
2019-10-02 03:25:39 +08:00
Amit Mahajan
214f7ec7fa Move getMmsConfig from SmsManager to MmsService.
Test: basic sanity
Bug: 140763963
Change-Id: If0a4b319f23d1a01e98f64ed1ae6eb6b90ccb02a
2019-10-01 11:05:10 -07:00
Brad Ebinger
05e03e8c0c Merge "Add Telecom command for setting connectionservice filter"
am: 25f4dca660

Change-Id: I00ba7ce3b64f4680eaf8798c52d98318160b45f0
2019-10-01 10:51:45 -07:00
Nathan Harold
e65e064e22 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE"
am: c75cf96f72

Change-Id: I4485da245b76c4ed8fba638092912564acc0927e
2019-10-01 10:46:48 -07:00
Jordan Liu
4ae91c0308 Expose CdmaSmsCbProgramData as SystemApi
Only getOperation and getCategory are currently used, so we only expose
those parts of the functionality. Eventually if we move BearerData to
the CBR app we will also have to expose the constructor, at which point
we may also want to expose the other constants that the constructor
uses, but for now this is okay.

Bug: 135956699
Test: manual
Change-Id: I1d3ba564372845f9b8a470adf82e84df745c02a7
Merged-In: I1d3ba564372845f9b8a470adf82e84df745c02a7
2019-10-01 10:42:56 -07:00
Jordan Liu
566ff18cc5 Merge "Expose CdmaSmsCbProgramData as SystemApi" 2019-10-01 17:39:17 +00:00
Brad Ebinger
25f4dca660 Merge "Add Telecom command for setting connectionservice filter" 2019-10-01 17:30:40 +00:00
Nathan Harold
c75cf96f72 Merge "Add Debounce text to ACTION_NETWORK_COUNTRY_CHANGE" 2019-10-01 17:29:29 +00:00
Hall Liu
7fe39a8776 Merge "Add carrier config for ignoring user RTT setting"
am: e93165456c

Change-Id: I73a4ab7963525669ccc74ef634345077e0ce618f
2019-09-30 18:46:17 -07:00
Hall Liu
e93165456c Merge "Add carrier config for ignoring user RTT setting" 2019-10-01 01:37:05 +00:00