Commit Graph

25663 Commits

Author SHA1 Message Date
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
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
Hall Liu
31de23da21 Add SDK compatibility code for new call states
Add code that translates the new call states to old call states for
in-call UIs that don't yet support background call screening.

Test: CTS
Bug: 140317205
Change-Id: I104f5f7ab3e3dc075e1d9ed5c64fcd924f9a977b
2019-10-11 17:59:42 -07:00
Brad Ebinger
f9f5ebd9ca Merge "Fix annotations in ImsSmsImplBase"
am: 90f4c2abe4

Change-Id: I81e572a926e92d75d83fbf3b169772635c733c15
2019-10-11 11:11:17 -07:00
Brad Ebinger
90f4c2abe4 Merge "Fix annotations in ImsSmsImplBase" 2019-10-11 17:47:54 +00:00
Brad Ebinger
50c7b1bedf Fix annotations in ImsSmsImplBase
Bug: 141568452
Test: manual
Change-Id: Iad595b75d47dc9fd356e6362e3adbcb5815e375d
2019-10-10 13:25:03 -07:00
Jordan Liu
21fedfab99 Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions""
am: 8172f45111

Change-Id: Ieed5df537d2b6ff40c8a6b2c2bd7c8ab090c2e9a
2019-10-09 14:26:12 -07:00
Jordan Liu
656502be63 [DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"
This reverts commit b59c74f302.

Reason for revert: depends on ag/9477322 being CP'd, or else causes breakages downstream (b/142399383)

Change-Id: I25b1695757d5fec8c00f05d033c33501f4fc5389
2019-10-09 13:34:26 -07:00
Jordan Liu
a2ca902d2f Merge "Add CellBroadcastService and related permissions"
am: 32382561a6

Change-Id: I158509f8c22b1ea5780d9dcae126f4bf32184564
2019-10-09 09:26:01 -07:00
Jordan Liu
b59c74f302 Add CellBroadcastService and related permissions
CellBroadcastService is bound to by the platform to handle cell
broadcasts.

Bug: 135956699
Test: manual
Change-Id: Ib1b20da03d271fc0b2736774b2ca6c6514944093
Merged-In: Ib1b20da03d271fc0b2736774b2ca6c6514944093
2019-10-08 11:20:46 -07:00
Iavor-Valentin Iftime
99d866acff Merge "API to detect which network interfaces support wake-on-lan"
am: 311fc569f3

Change-Id: I6239ae68559290e31f8c9384e0f973cfea30a1c7
2019-10-08 08:23:23 -07:00
Iavor-Valentin Iftime
311fc569f3 Merge "API to detect which network interfaces support wake-on-lan" 2019-10-08 15:08:18 +00:00
Valentin Iftime
c86ebbaebc API to detect which network interfaces support wake-on-lan
Add a new method in LinkProperties, isWakeOnLanEnabled() which returns
true if network interface is defined in config_wakeonlan_enabled_interfaces
string-array (config.xml)

Bug: 132705025
Test: atest LinkPropertiesTest & atest ConnectivityServiceTest
Change-Id: I3f7803aafd2f8eaf8aa18419b21339e15d4b7a0b
2019-10-08 13:03:30 +02:00
Tao Bao
d0ad6794d4 Merge "Use ParcelFileDescriptor over FileDescriptor"
am: 56f111e13b

Change-Id: I68c75d02a4eb4bc74fb83efe12ec5dce8d41f7f3
2019-10-07 09:57:55 -07:00
Tao Bao
56f111e13b Merge "Use ParcelFileDescriptor over FileDescriptor" 2019-10-07 16:38:11 +00: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
Shuo Qian
69eabb2397 Merge "Add both Emergency Number listener for testing"
am: 46cf71d1d0

Change-Id: I0973225c5125e0549757f609d52f58031e447f5d
2019-10-04 09:10:35 -07:00
Kyeongkab.Nam
73fde3809a Use ParcelFileDescriptor over FileDescriptor
The java.io.FileDescriptor object has a poor definition of ownership,
which can result in obscure use-after-close bugs. Instead, APIs should
return or accept ParcelFileDescriptor instances.

Bug: 130209137
Test: manual
Change-Id: Ifb3dd53dc138ec47f416f2d4b46c4668bc8ee1d8
2019-10-04 17:58:11 +09:00