Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
436,788 Commits 3 Branches 0 Tags
4de16c7cee84d4af252b7acdb833bca1dfdee37d
Commit Graph

25731 Commits

Author SHA1 Message Date
Shuo Qian
639d7e6110 Merge "Emergency number database config updater" am: ca0f14ec1a am: 9208fc5a0a 
am: a1c6087157

Change-Id: Ie1025f6f8173835d00988e54811f031121f4eab6
 2019-10-21 13:49:10 -07:00
Shuo Qian
a1c6087157 Merge "Emergency number database config updater" am: ca0f14ec1a 
am: 9208fc5a0a

Change-Id: Id32674a1021f1902444b996b0ee5eb4be5fe30a1
 2019-10-21 13:38:20 -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
Jordan Liu
33cf9d6cfe Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions" am: 6af905e0fe am: 09a3b50108 
am: e74e608513

Change-Id: I8e5a31c97f1e787e6dcd10f2a7084367e6174189
 2019-10-18 16:44:22 -07:00
Jordan Liu
e74e608513 Merge "[DO NOT MERGE] Add CellBroadcastService and related permissions" am: 6af905e0fe 
am: 09a3b50108

Change-Id: I22795c6c8ccff83c94d0e6df9b79152ac4421b74
 2019-10-18 16:37:43 -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
ca9e2ce2cc Merge "Telecom API updates for mainline support." am: b6377c0bf1 am: 7a7571af31 
am: 81995e753d

Change-Id: I25cd3e9cf0dec2522a1515b6de0a284777a7cca8
 2019-10-18 11:57:52 -07:00
Tyler Gunn
81995e753d Merge "Telecom API updates for mainline support." am: b6377c0bf1 
am: 7a7571af31

Change-Id: Ieb6b93d6db7c001c83859366c9b3dfde1e67a81d
 2019-10-18 11:45:02 -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
93cc10ac81 Merge "Expose MacAddress methods to public API" am: 7b98130570 am: 0688f9b6b1 
am: c55e2d6d59

Change-Id: I98471c410f483ad9d1ec1602c27bf4a21df305de
 2019-10-17 21:14:08 -07:00
Aaron Huang
c55e2d6d59 Merge "Expose MacAddress methods to public API" am: 7b98130570 
am: 0688f9b6b1

Change-Id: I1baaf191006cf6fb9fb1e718a755bb829f1cc899
 2019-10-17 21:07:13 -07: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
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
afefb720bb Merge "Add SDK compatibility code for new call states" am: 22027a86e2 am: d071c48af9 
am: 6355d3947f

Change-Id: If5c12292793afc5b76fb74a869353d92ce8dcb85
 2019-10-16 16:50:04 -07:00
Hall Liu
6355d3947f Merge "Add SDK compatibility code for new call states" am: 22027a86e2 
am: d071c48af9

Change-Id: I27bd9230c19b98a041a40c23016fd45f09d20921
 2019-10-16 16:36:02 -07:00
Brad Ebinger
5155061d42 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" am: 637c07424f am: 7dacb11cb5 
am: 9f0b529396

Change-Id: If3babb0133ebc2a6aa04fc52ac5d3c39f3e50b39
 2019-10-16 16:29:13 -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
Brad Ebinger
9f0b529396 Merge "Add CarrierConfig of voicemail number for roaming and IMS unregistered" am: 637c07424f 
am: 7dacb11cb5

Change-Id: I71ee158ba92b914e80dfafe0d564dbc7f1b5771f
 2019-10-16 16:17:15 -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
938817679b Merge "API Lint: Fix system-lint-baseline.txt" am: 4b5bcc1cb2 am: bc26831917 
am: b4498810b6

Change-Id: I97ceaddf980f67ef812080163b9c0a8b4465144b
 2019-10-16 08:24:56 -07:00
Adrian Roos
b4498810b6 Merge "API Lint: Fix system-lint-baseline.txt" am: 4b5bcc1cb2 
am: bc26831917

Change-Id: Ic71e2b4a6e5445539399c8c80d46e75eca87820a
 2019-10-16 05:34:13 -07: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
Saki Oomori
63bb856162 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-15 18:43:01 -07:00
Hall Liu
27b61580fe Merge changes from topics "add-certs-cp", "feature_BusyTone_for_DisconnectCause" am: 15ddba32e0 
am: 510f917b94

Change-Id: I75b891ec471515d8472c79164486eaeb51ae6119
 2019-10-15 17:22:23 -07: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
51984add12 Merge "API: enable API lint on public and system APIs" am: f8928da8c3 am: 85bd7e7e16 
am: 1775ad789b

Change-Id: Ibd39bf253a3dcff26a75082feac4c799a1b75962
 2019-10-14 06:51:08 -07:00
Adrian Roos
1775ad789b Merge "API: enable API lint on public and system APIs" am: f8928da8c3 
am: 85bd7e7e16

Change-Id: Ia2fe27f2919b96ae7414aa964f7497bd5cf9bbcf
 2019-10-14 06:44:10 -07: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
5525fd1924 Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 am: f9f5ebd9ca 
am: 0b37c14f40

Change-Id: Ie7ec40e4c37657a9a811fed180d56413213d85ef
 2019-10-11 11:27:38 -07:00
Brad Ebinger
0b37c14f40 Merge "Fix annotations in ImsSmsImplBase" am: 90f4c2abe4 
am: f9f5ebd9ca

Change-Id: I84f58daaf2ba037ea9a4feac97006ce848eadf4a
 2019-10-11 11:18:25 -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
96c51f58db Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"" am: 8172f45111 am: 21fedfab99 
am: 87d2acb711

Change-Id: I0b26a92e8c15a710a54576f8ce499ae441748dde
 2019-10-09 15:01:32 -07:00
Jordan Liu
87d2acb711 Merge "[DO NOT MERGE] Revert "Add CellBroadcastService and related permissions"" am: 8172f45111 
am: 21fedfab99

Change-Id: I1f62d488adf1bfa111efb7273a3ffa2046be7186
 2019-10-09 14:50:29 -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