Commit Graph

25680 Commits

Author SHA1 Message Date
Amit Mahajan
ed79bea3c4 Make isDataEnabledForApn() a system api.
Test: atest TelephonyManagerTest#testIsDataEnabledForApn
Bug: 140763963
Merged-in: Icbb29124294972766f68533b7e23700dd491c075
Change-Id: Icbb29124294972766f68533b7e23700dd491c075
(cherry picked from commit 505e174176)
2019-11-01 14:19:31 -07:00
Brad Ebinger
3d8a0ce489 Merge "Add new IRegistrationManager for managing IMS registration" 2019-11-01 18:01:07 +00:00
Brad Ebinger
58c1d5d729 Add new IRegistrationManager for managing IMS registration
Restructure registration API to allow for MMTEL and RCS to
both manage registration callbacks as well as provide new
query APIs for registration state and transport type.

Bug: 122098288
Test: atest GtsTelephonyTestCases
Merged-In: Ia568dcd059c2bcef26462e808088901edf6b072f
Change-Id: Ia568dcd059c2bcef26462e808088901edf6b072f
2019-11-01 09:41:57 -07:00
Treehugger Robot
07fcb99b1f Merge "Regenerate API signature files to correct annotation order" 2019-11-01 13:16:51 +00:00
Remi NGUYEN VAN
0d6c308c39 Merge "Add API to set the sll_protocol on PacketSocket" 2019-11-01 04:34:44 +00:00
Paul Duffin
b4f078e2ea Regenerate API signature files to correct annotation order
This does not change the API in anyway other than to enforce a
consistent, sorted order for all annotations; sorted by qualified
name of the annotation.

A simple bug in metalava meant that annotations were not sorted on an
API item that had exactly two annotations in the source. Fixing the
bug forced the regeneration of the signature files.

Bug: 143556317
Test: m checkbuild

(cherry picked from commit 7ba7991568)

Change-Id: I27795de6a8c83e419cda8807b8551a13bec1db10
Merged-In: I0a3d967571bb2f796f65c96a9ce9121e3538bad9
2019-10-31 23:29:44 +00:00
Amit Mahajan
0a7690ce24 Merge "New APIs for SMSC address" 2019-10-31 23:20:14 +00:00
Taesu Lee
f7488d0874 New APIs for SMSC address
Added getSmscAddress() and setSmscAddress() to access SMSC address in
(U)SIM through the SmsManager.
getSmscAddress() requires that the calling app is the default SMS app,
or has READ_PRIVILEGED_PHONE_STATE or the carrier privileges.
setSmscAddress() requires that the calling app is the default SMS app,
or has MODIFY_PHONE_STATE or the carrier privileges.

Test: Manual

Change-Id: Icb21aff450f71b30ef6a1181834014bf7b85b8e1
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2019-10-31 10:14:56 +09:00
Brad Ebinger
5c040e122f Add new system level APIs for accessing IMS state
1) Adds new system APIs that provide more access to IMS state.
2) Remove dependence on IPackageManager, which is not accessible
in mainline.

Bug: 141457496
Bug: 122098288
Test: atest FrameworksTelephonyTests
Merged-In: I17cbad4642ad3099668a354bb2588f2b55602311
Change-Id: I17cbad4642ad3099668a354bb2588f2b55602311
2019-10-30 16:33:52 -07:00
Ruoyao Liu (刘若尧)
51038e8b3c Add API to set the sll_protocol on PacketSocket
Problem & Root cause:
the mInterfaceBroadcastAddr.sll_protocol is not assigned when the
interface initializes, sll_protocol is 0x0000 by default.
This causes packets to be filtered incorrectly in packet capture,
typically with tcpdump. The previous API is used by DhcpClient, causing
DHCP tx messages to not be recognized properly.

Background: inside the kernel packets carry both an ethertype metadata
(skb->protocol) and may also carry a real ethertype in the mac header.

Previously skb->protocol would be inherited from the socket either from
the protocol from socket() creation or from bind().  This was zero,
so skb->protocol would end up 0, even though the DHCP packets we actually
wrote would have the right on-the-wire ethertype populated in the bytes
passed to send().

As such DHCP packets would look correctly on the wire, but were lacking
the skb->protocol metadata to correctly tag them as IPv4.

This results in 'tc' and packet hooks potentially not triggering
correctly, and can thus result in tcpdump 'ipv4' filters discarding
these packets leading to confusing/erroneous tcpdump output.

In newer kernels (somewhere around 5.3), if socket protocol is 0, we
actually parse out the right ethertype from the mac header during send().

However, for old kernels we can't rely on this kernel magic, and the
right fix is simply to make sure that socket bound protocol is correctly
set to ipv4 [htons(ETH_P_IP)] in the bind() system call.

Solution:
  Add a new constructor in SocketUtils to set the protocol parameter.
Bug: 133196453
Test: manual test
Change-Id: I07887b82e0e32aadb0cbb9f930f2b2fa3e277ca9
2019-10-30 06:26:10 +00:00
Treehugger Robot
5cd5e277dc Merge "Prevent sending CLIR activation and deactivation code only" 2019-10-30 00:08:27 +00:00
Xiangyu/Malcolm Chen
8ed3fb4bcf Merge changes from topic "getDeviceCapableModemCount"
* changes:
  Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
  Add public intent ACTION_MULTI_SIM_CONFIG_CHANGED.
2019-10-29 22:54:26 +00:00
Treehugger Robot
8c6e9e653d Merge "Expose APIs required by CarrierDefaultApp as system APIs." 2019-10-29 20:06:27 +00:00
Malcolm Chen
387dc0efd1 Rename and publicize getMaxPhoneCount; and deprecate getPhoneCount.
To have better names reflecting what getPhoneCount / getMaxPhoneCount
actually represent, we replace them with getActiveModemCount and
getSupportedModemCount. As getPhoneCount is public API, we mark
it as @Deprecated.

Bug: 141388730
Test: build
Change-Id: If086c50ae803b384691f709057bceeac2fc1d9d5
Merged-In: If086c50ae803b384691f709057bceeac2fc1d9d5
2019-10-29 12:19:32 -07:00
Malcolm Chen
64ff73fe4d 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
Merged-In: I717482ea05571afdfe6b04318d3f1fbda0c177ed
2019-10-29 12:15:59 -07:00
Hideki Ishii
de2688ec89 Prevent sending CLIR activation and deactivation code only
Sending CLIR activation("*31#") and deactivation("#31#") code without
dialing number is not allowed by some operator. This patch adds new
CarrierConfig key to prevent sending CLIR activation and deactivation
code only.

Test: manual - Verified behavior about sending "*31#" and "#31#"
Bug: 140366917
Change-Id: I2d53e438f96a9dabc99a544cea15c6841061f3d5
2019-10-28 15:44:29 -07:00
Peter Wang
ca01a7ee08 Merge "Add EuiccCardManager.ResetOption to eraseSubscriptions" 2019-10-28 19:32:18 +00:00
Xin Li
b2198fa670 Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Peter Wang
2ab852d411 Add EuiccCardManager.ResetOption to eraseSubscriptions
Bug: 139474431
Test: on device
Change-Id: Ib8496ed6dbc6179940892de8df7901e84dd67d76
Merged-In: Ib8496ed6dbc6179940892de8df7901e84dd67d76
2019-10-25 14:26:22 -07:00
Chen Xu
17518fa149 Merge "move CellBroadcastMessage from telephony-common to app" 2019-10-25 17:28:22 +00:00
Chen Xu
7e902363a6 Merge "make CallerInfo as SystemAPI" 2019-10-25 17:27:45 +00:00
Yincheng Zhao
02f0815ddc Merge "Adding API in TelephonyManger for updating Fplmns."
am: 32eb91717f

Change-Id: I6f1ec15774320b08238c9338ff849b7528c120a6
2019-10-24 14:38:49 -07:00
Yincheng Zhao
32eb91717f Merge "Adding API in TelephonyManger for updating Fplmns." 2019-10-24 20:50:27 +00:00
Michele
7d3017002f Expose APIs required by CarrierDefaultApp as system APIs.
Test: compilation
Bug: 140580265
Change-Id: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
Merged-In: I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee
2019-10-24 00:25:57 +00:00
Chen Xu
fba9ca44a2 make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.

Bug: 140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit b9a1eefec6)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
2019-10-21 21:39:58 -07:00
Shuo Qian
9208fc5a0a Merge "Emergency number database config updater"
am: ca0f14ec1a

Change-Id: Ice41292677b52fe62fa860960fe62a29e28068dc
2019-10-21 13:22:50 -07:00
Shuo Qian
ca0f14ec1a Merge "Emergency number database config updater" 2019-10-21 19:59:39 +00:00
Chen Xu
a6379bcd18 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
(cherry picked from commit 515285b1b5)
Merged-in: I07604101e3dccaa8e1539fa2644ef08da54d4533
2019-10-19 20:36:26 -07:00
Jordan Liu
09a3b50108 Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions"
am: 6af905e0fe

Change-Id: I166c9396c5b4d194cb2510a454005dc83b442247
2019-10-18 16:29:57 -07:00
Jordan Liu
7aea30267c [DO NOT MERGE] Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: I865c09d6d246779b706c06371df685d415618699
2019-10-18 14:20:50 -07:00
Tyler Gunn
7a7571af31 Merge "Telecom API updates for mainline support."
am: b6377c0bf1

Change-Id: Id3a2a3bf4a4922321780be7a6f103674d6922c85
2019-10-18 11:32:26 -07:00
Tyler Gunn
b6377c0bf1 Merge "Telecom API updates for mainline support." 2019-10-18 18:12:13 +00:00
Aaron Huang
0688f9b6b1 Merge "Expose MacAddress methods to public API"
am: 7b98130570

Change-Id: I98c2104fe5307e916bd2026eb943bfe4a9913d07
2019-10-17 20:55:36 -07:00
Aaron Huang
7b98130570 Merge "Expose MacAddress methods to public API" 2019-10-18 03:45:40 +00:00
yincheng zhao
da2ec5ccb1 Adding API in TelephonyManger for updating Fplmns.
Bug: 78790236
Test: Verified on blueline
Change-Id: Id19ae55cc03efbd085314e9d0026ca2486e9755d
Merged-In: Id19ae55cc03efbd085314e9d0026ca2486e9755d
(cherry picked from commit c245257cb1)
2019-10-17 20:08:37 -07:00
Shuo Qian
2f349da995 Emergency number database config updater
Test: https://paste.googleplex.com/5345498821033984
Bug: 136027884
Change-Id: I0fbd48fe8ef5e008af714312859b513a22679fcb
Merged-In: I0fbd48fe8ef5e008af714312859b513a22679fcb
(cherry picked from commit 8163b80a7e)
2019-10-17 23:42:06 +00:00
Tyler Gunn
c63f9082a6 Telecom API updates for mainline support.
Moving some Telecom APIs into public since they are harmless to expose.
Moving some other Telecom APIs into the System API space since they're
API details specific to the TelephonyConnectionService so don't need to
be exposed in the public API.

Bug: 141576016
Test: Manual smoke test.
Test: Run unit tests.
Test: Run CTS tests.
Change-Id: Iaf75b9d671712d791f501c11536e73436908f7de
Merged-In: Iaf75b9d671712d791f501c11536e73436908f7de
2019-10-17 10:05:44 -07:00
Hall Liu
d071c48af9 Merge "Add SDK compatibility code for new call states"
am: 22027a86e2

Change-Id: I3f1d667503cb406d04ad5910deb1177583243a36
2019-10-16 16:23:47 -07:00
Hall Liu
22027a86e2 Merge "Add SDK compatibility code for new call states" 2019-10-16 23:11:58 +00:00
Brad Ebinger
7dacb11cb5 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered"
am: 637c07424f

Change-Id: I4c0ac6c03b885744f05ea3876be8e86b7e7c4066
2019-10-16 16:04:17 -07:00
Brad Ebinger
637c07424f Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" 2019-10-16 22:54:54 +00:00
Adrian Roos
bc26831917 Merge "API Lint: Fix system-lint-baseline.txt"
am: 4b5bcc1cb2

Change-Id: If8052a23de91bd8d6d015236d36192d1d8342f4e
2019-10-16 05:27:14 -07:00
Adrian Roos
4b5bcc1cb2 Merge "API Lint: Fix system-lint-baseline.txt" 2019-10-16 12:07:52 +00:00
Hall Liu
510f917b94 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause"
am: 15ddba32e0

Change-Id: Iaf41586e1eb679a003ba4fc52c4413617c71e7a7
2019-10-15 17:08:32 -07:00
Hall Liu
15ddba32e0 Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause"
* changes:
  Add new carrier config to extend DisconnectCause to play busy tone
  add certs to carrier configs and store them as UiccAccessRules
2019-10-15 23:46:17 +00:00
Aaron Huang
f857470625 Expose MacAddress methods to public API
To support mainline modules, adding the methods which
are used by wifi.

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest android.net.cts
      atest android.net.wifi.cts
      atest FrameworksNetTests
      atest NetworkStackTests
      ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh

Change-Id: I49856863c15b6b3b59aa867a77b0f137003149ef
2019-10-15 17:33:05 +08:00
Saki Oomori
a70040841a Add new carrier config to extend DisconnectCause to play busy tone
This carrier config is used to specify additional DisconnectCause for
playing busy tone.

Bug: 116189822
Test: manual - Checked that busy tone is played according to
"KEY_DISCONNECT_CAUSE_PLAY_BUSYTONE_INT_ARRAY".
Change-Id: I58afb08ddc718bfb23d6c8b4f248c4c05d084829
2019-10-14 18:20:54 -07:00
Adrian Roos
c2e1606d5f API Lint: Fix system-lint-baseline.txt
Bug: 142459906
Test: make checkapi
Change-Id: Ib0fc79c7983712f0a7e30a13a78708dba1b256cb
Merged-In: Ib0fc79c7983712f0a7e30a13a78708dba1b256cb
2019-10-14 16:43:25 +02:00
Adrian Roos
85bd7e7e16 Merge "API: enable API lint on public and system APIs"
am: f8928da8c3

Change-Id: I4e567d59fc3008b42f3f0ccc4ac0bec37abca211
2019-10-14 06:31:37 -07:00
Adrian Roos
487c646dc0 API: enable API lint on public and system APIs
Bug: 142459906
Test: make checkapi
Change-Id: I1457917dbdff1c1738c17b4d9683a79add971b34
Merged-In: I1457917dbdff1c1738c17b4d9683a79add971b34
2019-10-12 20:45:39 +02:00