Commit Graph

560310 Commits

Author SHA1 Message Date
Cody Kesting
e980914d42 Merge changes from topic "vcn-network-policy"
* changes:
  Implement Network policy in VcnManagementService.
  Unit test UnderlyingNetworkTracker.
  Register NetworkCallbacks in UnderlyingNetworkTracker.
2021-02-02 20:33:50 +00:00
Shashwat Razdan
10603d5102 Merge "Adding owners in smartspace packages" 2021-02-02 20:23:26 +00:00
Nazanin Bakhshi
99955ce46b Merge "Add an event and a parcelable to receive bluetooth framework call quality signal" 2021-02-02 19:21:22 +00:00
Brad Ebinger
5c389e2507 Merge "Add SIP configration Bundle keys for UA and CNI" 2021-02-02 17:53:18 +00:00
Shashwat Razdan
057896ae34 Adding owners in smartspace packages
Test: not needed as this is a meta file change

Change-Id: I32f5205c4c1b771aae963a20e9a52fa7691ce271
2021-02-02 17:50:18 +00:00
Treehugger Robot
19547685bb Merge "Update frameworks to use unbundled version of BouncyCastle." 2021-02-02 14:37:05 +00:00
Junyu Lai
4a76351c9b Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" 2021-02-02 13:57:57 +00:00
Treehugger Robot
ae728c12ac Merge "Sort import statements in RoutingControlAction.java" 2021-02-02 11:43:08 +00:00
Lorenzo Colitti
22823382e4 Merge changes I4f38a539,Id4f6c7f4
* changes:
  Add the underlying networks to NetworkAgentInfo#toString.
  Improve testing for network blocking.
2021-02-02 10:06:03 +00:00
Paul Hu
c4cf8d3dfa Merge "Remove ArrayUtils usage in connectivity frameworks classes" 2021-02-02 08:47:04 +00:00
Lorenzo Colitti
ee73d9b87c Add the underlying networks to NetworkAgentInfo#toString.
This is useful in debugging VPN networks.

Bug: 173331190
Test: manual
Change-Id: I4f38a53980191a1813c2ef313fedc51af98f18f6
2021-02-02 16:17:22 +09:00
Lorenzo Colitti
ac799e5a4d Improve testing for network blocking.
This simplifies the uidNetworkingBlocked method and makes it more
realistic by supporting more combinations of rules than just the
four used by this test.

Also support RULE_ALLOW_METERED, and add test coverage for it.

Test: test-only change
Change-Id: Id4f6c7f41429f3ae7841d3214b3e5e95ec591f85
2021-02-02 16:17:22 +09:00
Donald Chai
182e90d1ea Merge "Fix typo in comment." 2021-02-02 06:07:18 +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
Aravind Angadi
be480e61e0 Sort import statements in RoutingControlAction.java
Test: None

Change-Id: If6556c47fed63a01013ffa1a2a0ccc2afd774989
2021-02-02 05:47:58 +00:00
Treehugger Robot
4ad0fdc5c9 Merge "Have connectivity self-register manager classes" 2021-02-02 05:01:04 +00:00
Donald Chai
5f3a83529c Fix typo in comment.
Change-Id: Ie35db2cfef32543e573bf701d2d523f5f1502161
Tested: N/A
2021-02-02 03:58:05 +00:00
Lucas Lin
30a0fe39fd Merge "Use function inside NetdUtils instead of NetworkManagementService" 2021-02-02 03:38:38 +00:00
junyulai
cddc3dde5d [VCN08] Expose NOT_VCN_MANAGED capability as system API
Test: m -j doc-comment-check-docs
Fix: 177299683
Bug: 175662146
Change-Id: Iaa53d21774ea48af5fe339b57bf1235c77f295a0
2021-02-02 11:34:09 +08:00
Brad Ebinger
c28d5844dd Add SIP configration Bundle keys for UA and CNI
Adds IMS SIP configuration bundle keys for User-Agent and
Cellular-Network-Info headers required by some networks.

Bug: 178606181
Test: atest CtsTelephonyTestCases:SipDelegateManagerTest
Change-Id: I389162ca0c6348580f6ee8bb6ce5ee3a4e84595e
2021-02-02 00:53:02 +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
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
Cody Kesting
07979a07cc Implement Network policy in VcnManagementService.
This CL implements #getUnderlyingNetworkPolicy() for
VcnManagementService. Specifically, it takes the provided
NetworkCapabilities and checks for a corresponding VCN. If one exists,
a VcnUnderlyingNetworkPolicy will be returned with a copy of the
original NetworkCapabilities without the capability NOT_VCN_MANAGED and
with the unwanted capability NOT_VCN_MANAGED.

Any NetworkCapabilities without a corresponding VCN will be returned a
VcnUnderlyingNetworkPolicy with the original NetworkCapabilities intact.

Bug: 175914059
Test: atest FrameworksVcnTests
Change-Id: Icdffc4f586f58a0e5b6290d5c6449e2bbed5cab0
2021-02-01 14:46:58 -08:00
Cody Kesting
f029daa404 Unit test UnderlyingNetworkTracker.
Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: I681b0bef27cdd1974a574e81b4b435578cd6e9cd
2021-02-01 14:46:57 -08:00
Cody Kesting
a382c9ca0c Register NetworkCallbacks in UnderlyingNetworkTracker.
This CL updates UnderlyingNetworkTracker to register NetworkCallbacks.
UnderlyingNetworkTracker uses two types of NetworkCallbacks:
  - bringup requests
  - selection requests

Bringup requests ensure that VCN-managed Networks are not reaped.
Separate bringup requests are filed for wifi and cell Networks. One cell
request is filed for each subscription ID (subId) in the VCN's
subscription group.

Selection requests are used to allow ConnectivityService to perform
Network selection for the VCN's selected underlying Network (the Network
that VCN traffic will be routed through).

Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: Ic4dc13a3f7acf08589ddb25b343af2677cd7cf65
2021-02-01 14:46:57 -08: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
Nazanin
9bf6b3de91 Add an event and a parcelable to receive bluetooth framework call
quality signal

Bug: 173137125
Test: manual test check for regression
Change-Id: I38e70ea284707d39cec7cb4fbdfd36be4f83e403
Merged-In: I38e70ea284707d39cec7cb4fbdfd36be4f83e403
2021-02-01 21:36:48 +00:00
Mikhail Naganov
499850f976 Merge "Remove audio HAL V2 from "interfaces of interest"" 2021-02-01 21:22:39 +00:00
Janis Danisevskis
f246dc6346 Merge "Keystore 2.0 SPI: Small fix to apease CTS test." 2021-02-01 18:33:32 +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
5a700b2725 Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" 2021-02-01 15:33:11 +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
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
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
87d840addd Merge "Support for showing percent progress in boot animation." 2021-02-01 09:51:30 +00:00
paulhu
8679d7816a Remove ArrayUtils usage in connectivity frameworks classes
Instead, use CollectionUtils from frameworks/libs/net.

Bug: 174541037
Test: atest FrameworksNetTests
Change-Id: I610e00302cf76510e9e34ac8a9a5f738e5ecd0c7
2021-02-01 16:30:08 +08: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
3d70ab73eb Merge "Move module sources to packages/Connectivity" 2021-02-01 05:25:15 +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
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