James Lin
3640adadee
Merge "[RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled" am: 02bf7d1288
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0dc0528dc475aaab0868ce891340c2cc815712dd
2021-02-02 06:09:49 +00:00
James Lin
02bf7d1288
Merge "[RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled"
2021-02-02 05:52:03 +00:00
Treehugger Robot
98c48f7101
Merge "Have connectivity self-register manager classes" am: 4ad0fdc5c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552657
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I73f3c0c312ae9e1786204776e98240c259416a8b
2021-02-02 05:43:12 +00:00
Treehugger Robot
4ad0fdc5c9
Merge "Have connectivity self-register manager classes"
2021-02-02 05:01:04 +00:00
Lucas Lin
ac2004ef29
Merge "Use function inside NetdUtils instead of NetworkManagementService" am: 30a0fe39fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534904
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibc30a45e691ec76703452595b62b588b78cd8048
2021-02-02 04:18:56 +00:00
Lucas Lin
30a0fe39fd
Merge "Use function inside NetdUtils instead of NetworkManagementService"
2021-02-02 03:38:38 +00:00
Jeff Sharkey
f486d1dc63
Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl" am: 0db5d441ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1568920
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I961376b02a6ffe105cb547e741d66774acdffeeb
2021-02-02 00:25:53 +00:00
Mitch Phillips
cad354ec50
Merge "[MemInit] Use new MemInit API." am: 8a956c5f9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555544
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1332e4476cc8470791cacae0bbe605a24d1e3b18
2021-02-02 00:04:59 +00:00
Serik Beketayev
82e4d3638c
Merge "[Mainline] Migrate com.google.android.collect pkg" am: b9c6a7470e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1648cf0bc1803d59787edb8715b0abc63728cc5d
2021-02-01 23:50:59 +00:00
Jeff Sharkey
0db5d441ad
Merge "Add BATTERY_STATS_OWNERS for IBatteryStats.aidl"
2021-02-01 23:45:18 +00:00
Dmitri Plotnikov
1ef5d3f87e
Add BATTERY_STATS_OWNERS for IBatteryStats.aidl
...
Change-Id: Iffb8ded9ff5edc899ab38c74ffe3ad98793ca67c
2021-02-01 23:42:59 +00:00
Daniel Bright
3504c8c759
Merge "Partial hal support for secondary link bandwidth" am: bed5f6e84d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565115
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib46315e1fe0bf0a69cc17c6d73cd913379a73845
2021-02-01 23:42:52 +00:00
Lorenzo Colitti
b6925c2fc7
Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time." am: d6d96a4625
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565204
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id00ebe6331ae65ba4c3ee2f549e89ba3a527bd2c
2021-02-01 23:32:34 +00:00
Mitch Phillips
8a956c5f9c
Merge "[MemInit] Use new MemInit API."
2021-02-01 23:32:24 +00:00
Serik Beketayev
b9c6a7470e
Merge "[Mainline] Migrate com.google.android.collect pkg"
2021-02-01 23:11:56 +00:00
Daniel Bright
bed5f6e84d
Merge "Partial hal support for secondary link bandwidth"
2021-02-01 22:48:44 +00:00
Lorenzo Colitti
d6d96a4625
Merge "Add UsbHandlerTest test for NCM and RNDIS at the same time."
2021-02-01 22:45:00 +00:00
James.cf Lin
1d44f9e09e
[RCS UCE] Add the APIs to access the device config of RCS User Capability Exchange enabled
...
Bug: 178239287
Test: atest -c CtsTelephonyTestCases:android.telephony.ims.cts.RcsUceAdapterTest
Change-Id: I1bd2d0e0dc88dcd72e7c2682483c8039f4aa8927
2021-02-02 06:30:49 +08:00
Mikhail Naganov
15b8dd5aad
Merge "Remove audio HAL V2 from "interfaces of interest"" am: 499850f976
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I10bb28505163ae9651c9191ef11bc17500dd6b07
2021-02-01 22:20:27 +00:00
Mikhail Naganov
499850f976
Merge "Remove audio HAL V2 from "interfaces of interest""
2021-02-01 21:22:39 +00:00
Janis Danisevskis
b30a7eb006
Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1363de7ca5d2600cfa999627ead673752e43b91
2021-02-01 19:58:52 +00:00
Benedict Wong
4ef820417a
Merge "Remove usages of hidden connectivity APIs" am: 8d8f48f0fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564501
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8c9125091d0d348f310c31e59d5e94f7b6e9a8c0
2021-02-01 18:49:48 +00:00
Janis Danisevskis
f246dc6346
Merge "Keystore 2.0 SPI: Small fix to apease CTS test."
2021-02-01 18:33:32 +00:00
Grace Jia
f5468331b4
Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself." am: 59c47d24fc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526998
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64ff49bbb502052a4e19a654170ff953c378c664
2021-02-01 18:18:11 +00:00
Benedict Wong
8d8f48f0fd
Merge "Remove usages of hidden connectivity APIs"
2021-02-01 18:10:35 +00:00
Grace Jia
59c47d24fc
Merge "Add relative APIs for InCallService that can support self-managed connections that want to expose itself."
2021-02-01 17:55:33 +00:00
Lorenzo Colitti
f681bee340
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 5a700b2725
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I147a86d5252f29a88d3a0fdb5c27d4c101791e7c
2021-02-01 16:04:06 +00:00
Lorenzo Colitti
5a700b2725
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs""
2021-02-01 15:33:11 +00:00
Anton Hansson
389332a285
Merge changes If81cda01,I1df8b8e0 am: 3351717493
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26af56f725ad03555b7991f51cfbebbbbdd758d7
2021-02-01 14:54:47 +00:00
Grace Jia
4e8dc10871
Add relative APIs for InCallService that can support self-managed
...
connections that want to expose itself.
Add PhoneAccount#EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE and
Connection#onInCallServiceTrackingChanged.
Bug: 161144815
Test: CtsTelecomTestCases
Change-Id: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
Merged-In: I0a42ea79a1cd46aa9df3399c4fa2e9396321778a
2021-02-01 14:51:31 +00:00
Anton Hansson
285c6a2018
Limit build visibility of modules in apex/... am: 096a1756fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566279
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie104a8cce24b86fe6dbea57119ee2a9090edb7ce
2021-02-01 14:50:38 +00:00
Anton Hansson
3351717493
Merge changes If81cda01,I1df8b8e0
...
* changes:
Suppress [CallbackInterface] metalava rule for mainline modules.
Limit build visibility of modules in apex/...
2021-02-01 14:02:20 +00:00
Lorenzo Colitti
2425886baa
Merge changes Idcc9e32c,I58769bb7 am: d4caba4daf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552503
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If12227f11585de18d92995cf603765b18f91764f
2021-02-01 11:36:03 +00:00
Lorenzo Colitti
d4caba4daf
Merge changes Idcc9e32c,I58769bb7
...
* changes:
Remove getFilteredNetworkState and add @NonNull in NetworkState.
Add test coverage for get*NetworkInfo on metered networks.
2021-02-01 10:56:19 +00:00
Nicolas Geoffray
b86c3a3470
Merge "Support for showing percent progress in boot animation." am: 87d840addd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545805
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64c03c5c85c216eb739e482eca267c1dadd3169b
2021-02-01 10:26:21 +00:00
Nicolas Geoffray
87d840addd
Merge "Support for showing percent progress in boot animation."
2021-02-01 09:51:30 +00:00
Lorenzo Colitti
0053756e78
Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"
...
This reverts commit c92a798ee8 .
Reason for revert: not necessary, since VCN already has access to system APIs
Bug: 174606949
Test: revert with no conflicts
Change-Id: Ife2d0fc08c540265d52cdf930d0b6df005990ac8
2021-02-01 08:13:32 +00:00
Remi NGUYEN VAN
b74c92e2a8
Have connectivity self-register manager classes
...
As connectivity services are planned to move to a separate module, move
the manager classes registration from SystemServiceRegistry to
ConnectivityServicesRegistrar, using the registerContextAwareService
APIs.
This follows patterns and naming in WifiFrameworkInitializer.
Bug: 171540887
Test: device boots, connectivity working
Change-Id: I62ced1275750c73f209bac8ec3a3204b95695b83
2021-02-01 17:10:39 +09:00
Lorenzo Colitti
d8cc12a87b
Remove getFilteredNetworkState and add @NonNull in NetworkState.
...
getFilteredNetworkState is only used in two places, both of which
use only small parts of the NetworkState that is returned to
them. Remove the method and replace it with inline code in the
two callers. NetworkState is a fairly expensive object, and this
removes the need to perform lots of defensive copies of data that
the caller does not need.
Also remove the only call to the NetworkState constructor in
ConnectivityService. That leaves only one caller to the
NetworkState constructor, the one in NetworkAgentInfo. This
constructor is called with defensive copies of NetworkInfo,
LinkProperties, and NetworkCapabilities, so mark these three
parameters as @NonNull. It's also called with a non-null
Network, because NetworkAgentInfo is only constructed with
non-null Networks, so mark the network parameter @NonNull as
well.
In order to make the arguments in the NetworkState constructor
@NonNull, introduce a new constructor that sets everything to
null and make NetworkState.EMPTY call it.
Test: atest FrameworksNetTests
Change-Id: Idcc9e32c53533b0cf61494517e62d4c184fa7610
2021-02-01 16:12:04 +09:00
Lorenzo Colitti
cfc5ab2f25
Add test coverage for get*NetworkInfo on metered networks.
...
Test: test-only change
Change-Id: I58769bb768978d0acff1da6d32c2f6942c43508b
2021-02-01 15:58:12 +09:00
Remi NGUYEN VAN
5acf0f78fb
Merge "Move module sources to packages/Connectivity" am: 3d70ab73eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552656
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42989abf6e81a4c0e7bed6b0890a1ee4f2c30191
2021-02-01 06:09:33 +00:00
Remi NGUYEN VAN
3d70ab73eb
Merge "Move module sources to packages/Connectivity"
2021-02-01 05:25:15 +00:00
Chalard Jean
356c6725c6
Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I247c61247bb5d8a046e0a0cc3ac4605d0dd1d8df
2021-02-01 05:03:49 +00:00
Janis Danisevskis
05943c30a1
Keystore 2.0 SPI: Small fix to apease CTS test.
...
* The Keystore SPI needs to return null if getKeyEntry is called on a
pure certificate entry.
* Also checked the wrong purpose.
Test: Keystore CTS tests.
Change-Id: Ib668447a9ff56fc4cea550f547c6cbfea3590cb3
2021-01-31 20:41:51 -08:00
Chalard Jean
1595b1aa38
Merge "Start VcnManagementService after ConnectivityService"
2021-02-01 04:38:08 +00:00
Calvin Pan
e532d3be62
Merge "Add TelephonyShellCommand to get EAB contact" am: d2d77dba7d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5d2c0290c0aeb574c2cc5201e8012a79f0ab6e3e
2021-02-01 03:03:52 +00:00
Alex Buynytskyy
feaccc5be9
Merge "create owners" am: 00c3346e2d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565113
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic34bc41155854d3eb1867081f799edc6db158c6c
2021-02-01 02:59:24 +00:00
Remi NGUYEN VAN
a31d729863
Move module sources to packages/Connectivity
...
Files that are planned to be part of the connectivity module are grouped
in packages/Connectivity, so they can be built separately and moved in
one operation with their history into packages/modules/Connectivity.
This places the files in the existing framework-connectivity-sources
filegroup instead of the current framework-core-sources filegroup. Both
are used the same way in framework-non-updatable-sources.
Bug: 171540887
Test: m
Change-Id: I62d9d91574ace6f5c4624035d190260c3126b91e
2021-02-01 11:52:14 +09:00
Calvin Pan
d2d77dba7d
Merge "Add TelephonyShellCommand to get EAB contact"
2021-02-01 02:46:16 +00:00
Alex Buynytskyy
00c3346e2d
Merge "create owners"
2021-02-01 02:13:19 +00:00