Commit Graph

6246 Commits

Author SHA1 Message Date
Benedict Wong
795d43d31d Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f am: 33d2807b02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688783

Change-Id: Ica36f177bcb4a1d6625a0bf14288f6acd3ea4224
2021-04-29 05:44:56 +00:00
Benedict Wong
c6fe30068d Merge "Update set|getRetryIntervalsMs to Millis" 2021-04-29 04:35:45 +00:00
Aaron Huang
a10cc3aa60 Rename *Iface* APIs to *Interface*
Address API review feedback, other APIs have been refering to
these as "interface" instead of "iface" so migrate the APIs named
*Iface* to *Interface*.

Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
2021-04-28 17:57:32 +08:00
Benedict Wong
3de56b2ee0 Merge "Allow VcnTransportInfo to be parcelled" am: eecd1d9ca5 am: 3e633b7822 am: 13ffa97a76
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686985

Change-Id: If4f26b60f10be868ae0763a4fcccb61695d39151
2021-04-28 02:50:12 +00:00
Benedict Wong
913ae2b89b Allow VcnTransportInfo to be parcelled
Allows VCN transport info to be parcelled for purposes of sysUI

Bug: 186025257
Test: atest FrameworksVcnTests
Change-Id: I5a5d9b88659c8dcaa9ded16d491b2bac0529169a
2021-04-27 17:35:44 -07:00
Benedict Wong
e7f06d9eb9 Update set|getRetryIntervalsMs to Millis
Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I696854960ca9488ae2c8a0c569c57a8563998ac8
2021-04-27 22:28:43 +00:00
Yan Yan
e1d6b0872f Merge "Remove TunnelConnectionParams interface" am: b8f67d1bd7 am: b1578de55a am: 92154c7465
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684427

Change-Id: I546b7eecca41d2a745b65f67961a2634be29609f
2021-04-27 19:51:26 +00:00
Yan Yan
b8f67d1bd7 Merge "Remove TunnelConnectionParams interface" 2021-04-27 18:34:08 +00:00
Lorenzo Colitti
bd446384c8 Remove EXTRA_PROXY_INFO.
This has been deprecated since M because it very error-prone, and
there are documented replacements.

Test: m
Bug: 171872228
Change-Id: Ide9846a26fc440b3ec5b4e4b444a046e738de3d6
2021-04-27 20:01:22 +09:00
Les Lee
ba1e643715 Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94 am: debea981d9 am: 638b67a58f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
2021-04-27 06:00:48 +00:00
Les Lee
bef2f5be94 Merge "wifi data usage: support to get carrier merged wifi network." 2021-04-27 02:13:32 +00:00
Yan Yan
de7222cba5 Remove TunnelConnectionParams interface
To avoid exposing empty interface.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ia33e75b77f1563a1c3d31e0145b7ec2be728b6db
2021-04-26 10:47:05 -07:00
Yan Yan
fcadf51f2c Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel" am: bc545c8a8a am: 7a52d5a3eb am: 1df96ea6ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652997

Change-Id: If056d1a90cc4dce3882168ca23302fcd086b40ae
2021-04-22 10:08:28 +00:00
Yan Yan
55b1e5fbf5 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a am: e80e82bb67 am: 7a961913b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: Idbd09b9f8a7143e586b23db47bcffcd0b82ea0c0
2021-04-22 10:08:15 +00:00
Yan Yan
30dd69e144 Create TunnelConnectionParams interface am: 83956e2a5d am: 586eca54de am: bf54f022db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I76bec559bfad6b36c7533d1b76b09fc474c3883e
2021-04-22 10:08:03 +00:00
Yan Yan
e80e82bb67 Convert TunnelConnectionParams to/from PersistableBundle am: c0b7c4fa5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653048

Change-Id: I71e0b9735af25bb3d2f8de17df1dac3df0e10106
2021-04-22 09:16:46 +00:00
Yan Yan
586eca54de Create TunnelConnectionParams interface am: 83956e2a5d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654113

Change-Id: I0c67adb36b0bf69729a40a46eb2dd018db308312
2021-04-22 09:13:35 +00:00
Yan Yan
bc545c8a8a Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel"
* changes:
  Replace VcnControlPlaneConfig with TunnelConnectionParams
  Convert TunnelConnectionParams to/from PersistableBundle
  Create TunnelConnectionParams interface
2021-04-22 08:39:20 +00:00
Yan Yan
4eaa894d84 Replace VcnControlPlaneConfig with TunnelConnectionParams
Use the more generic object TunnelConnectionParams in VCN.
TunnelConnectionParams may also be used in VPN in the future.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ie433f9df614e1f51cdff200d915b68b61e5ca35e
2021-04-21 22:52:22 -07:00
Yan Yan
c0b7c4fa5a Convert TunnelConnectionParams to/from PersistableBundle
Add utility class to convert TunnelConnectionParams to and from
PersistableBundle.

Bug: 180664474
Test: atest EncryptedTunnelParamsUtilsTest
Change-Id: I93ae068eb6d1e1c4d3fcbaccbaae867db8d07a38
2021-04-21 22:49:47 -07:00
Yan Yan
83956e2a5d Create TunnelConnectionParams interface
TunnelConnectionParams represents configurations for setting up a
secure encrypted tunnel with a remote endpoint. TunnelConnectionParams
will be used to configure a VCN and will be used for VPN configuration
in the future.

Bug: 180664474
Test: make update-api
Change-Id: Ic8e5c8535e84971517f16c54ce8b8645cfc7f944
2021-04-21 22:48:21 -07:00
Lorenzo Colitti
609f5cff0b Merge "Hide NetworkPolicyManager.blockedReasonsToString API." am: 0549ca0217 am: fe78ceab36 am: 8027b42fe6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682220

Change-Id: If0d8f99d618173d707d2f473d4f6634c3461f0ca
2021-04-22 03:29:41 +00:00
Aaron Huang
0924e0d9d6 Merge "Add getters to UnderlyingNetworkInfo" into sc-dev 2021-04-22 03:09:41 +00:00
Benedict Wong
fbc23c6adb Merge changes I64b56575,I40553a7b am: 80afe1eeee am: f595e45401 am: 0b3c038764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682062

Change-Id: I50cb828d54b8f7669c33945c7cef8a366c7c316c
2021-04-22 02:50:04 +00:00
Lorenzo Colitti
0549ca0217 Merge "Hide NetworkPolicyManager.blockedReasonsToString API." 2021-04-22 02:36:11 +00:00
Benedict Wong
80afe1eeee Merge changes I64b56575,I40553a7b
* changes:
  Expose API for retrieval of subscription groups with VCN configured
  Add support for retrieval of configured VCNs by carrier privilege
2021-04-22 01:31:11 +00:00
Benedict Wong
d776b3762e Expose API for retrieval of subscription groups with VCN configured
Per API council feedback, this change adds a new API to retrieve all
subscription groups that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I64b565758e0a27552eee9f860e0674db2fb35980
2021-04-21 13:49:35 -07:00
Benedict Wong
6e8c1d6da7 Add support for retrieval of configured VCNs by carrier privilege
This change adds support for retrieval of a list of subscription groups
that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I40553a7bb45d9b1f948c7d0a791f1b22a422d55c
2021-04-21 13:49:14 -07:00
Yan Yan
f3af46a6ec Merge "Include PORT_4500 option when encoding IkeSessionParams" am: c65ed07b59 am: 33f08103fa am: 04992800bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682405

Change-Id: Id235ce1f89dc48a3cf3ad26ea0217573cc1aa708
2021-04-21 19:29:43 +00:00
Yan Yan
c65ed07b59 Merge "Include PORT_4500 option when encoding IkeSessionParams" 2021-04-21 18:08:33 +00:00
Benedict Wong
cc47505d00 Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" am: 9ef01fca2a am: a746f701e2 am: 425952791a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682061

Change-Id: If957c0783fd0e7f4a6340eed8cd6e19b466048a3
2021-04-21 17:56:41 +00:00
Aaron Huang
5d3144c977 Merge "Add getters to NetworkStateSnapshot" into sc-dev 2021-04-21 11:20:10 +00:00
Sudheer Shanka
00f344a18e Hide NetworkPolicyManager.blockedReasonsToString API.
BLOCKED_REASON_* constants have been moved to ConnectivityManager
and blockedReasonsToString() util method doesn't belong in
NetworkPolicyManager as an API. So, just removing it for now.

Bug: 185967486
Test: treehugger
Change-Id: Ie04044980fdfc7ec772444be13fc659880953bd1
2021-04-21 07:23:54 +00:00
Benedict Wong
85d294282c Rename get/setRetryInterval to get/setRetryIntervalsMs
Per API feedback, the get/set methods for retry intervals are renamed to
be plural, and have time units

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I51b3ffcfa44f72805f359e56b263da2558325372
2021-04-21 00:44:37 +00:00
Yan Yan
c130a2a8b1 Include PORT_4500 option when encoding IkeSessionParams
This commit makes sure IKE_OPTION_FORCE_PORT_4500 is included
when converting IkeSessionParams to a PersistableBundle.

Bug: 185637142
Test: atest IkeSessionParamsUtilsTest
Change-Id: I1fcd6d26e64217091ad960a1c51659046e70a6ac
2021-04-20 16:41:00 -07:00
Aaron Huang
d78c60c10a Add getters to NetworkStateSnapshot
Address API council feedback, add getters to NetworkStateSnapshot
instead of exposing the bare fields directly.

Bug: 183972826
Test: FrameworksNetTests
Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
2021-04-20 21:55:56 +08:00
Aaron Huang
f6008978c4 Add getters to UnderlyingNetworkInfo
Address API review feedback, add getters to UnderlyingNetworkInfo
instead of exposing fields.

Instead of wasting memory by converting this into an array, have
migrateTun take a List<String>. In turn, tunAdjustmentInit should
also take a List<String>.

Bug: 183972554
Test: atest android.net.UnderlyingNetworkInfoTest
Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
2021-04-20 13:34:52 +08:00
Yan Yan
8dbc89396d Merge "Use #setNetwork and #getNetwork for IkeSessionParams" am: 3022c5437c am: cc0c3a5f62 am: faf572b9ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675285

Change-Id: I94d750ce60a8caaeb221875cfa8ef3f570863ab9
2021-04-19 19:18:22 +00:00
Yan Yan
3022c5437c Merge "Use #setNetwork and #getNetwork for IkeSessionParams" 2021-04-19 17:04:25 +00:00
lesl
f4c0625458 wifi data usage: support to get carrier merged wifi network.
Carrier merged wifi network is a specific cerrier wifi network
which provides the same user experience as mobile.

To support data usage accounting for carrier merged wifi,
the change provide several APIs in NetworkTemplate:

  1. extend buildTemplateWifi so it could be used for matching
     wifi networks with subscriber Id (IMSI).
  2. add buildTemplateCarrier to let
     NetworkPolicyManagerService creates a single policy for
     a given carrier regardless of network type.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Test: atest -c NetworkStatsServiceTest
Test: Manual Test with test code on mobile and wifi network.
      1. buildTemplateCarrier includes the carrier wifi and
         mobile usage
      2. buildTemplateWifi can get carrier wifi usage and support the
         filter via subscriberId

Change-Id: I667b4adf3eec0bdd3a7385109dd8c1fae8e7be32
2021-04-19 16:13:27 +08:00
Sarah Chin
7fa5d35a45 Merge "Update documentation for setSubscriptionOverride" into sc-dev 2021-04-16 23:58:42 +00:00
Paul Hu
3d41ec9b45 Merge "Add NWM#getWatchlistConfigHash to test api for testing" am: e87f10b9a6 am: 4d4af2bd05 am: b3ebae141f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675628

Change-Id: I08164c986c247fa36aa25afc533f9ad656ab8850
2021-04-16 09:31:07 +00:00
Lorenzo Colitti
9678fd13cd Merge "Don't expose raw IBinder APIs." am: 4b4cc572c0 am: 3aba6fdd68 am: 4911a46b2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1676436

Change-Id: Ic45558c739cfb065e5c9d6fb5ebf485ceb9a630f
2021-04-16 08:48:41 +00:00
Paul Hu
e87f10b9a6 Merge "Add NWM#getWatchlistConfigHash to test api for testing" 2021-04-16 08:10:33 +00:00
Sarah Chin
f7e9c836c4 Update documentation for setSubscriptionOverride
Test: build
Fix: 180496714
Change-Id: Iebfcd0ece1891c1b77d132b92e93d8c1eea3aa6e
2021-04-15 19:53:14 -07:00
Lorenzo Colitti
103e78ed48 Don't expose raw IBinder APIs.
APIs should not expose raw IBinder objects.

Fix: 184735751
Test: builds, boots
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Change-Id: Ia0c4170def31123f0b79318fec2cfe02e4fcd3bf
2021-04-15 18:47:21 +09:00
Treehugger Robot
2d4f2324cf Merge "Make TYPE_VPN_LEGACY no longer deprecated." am: 590949fd61 am: 9d5240865f am: 0d3acacdd5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675627

Change-Id: Ib6419d4d408c5f4859bac2e92b1811dffd513c9c
2021-04-15 05:50:32 +00:00
paulhu
675ffd271b Add NWM#getWatchlistConfigHash to test api for testing
Bug: 185309847
Test: m update-api
Change-Id: I4fb1503827b3a9e3105c2340ffbaaa2ec593d96b
2021-04-14 23:54:55 +08:00
Lorenzo Colitti
fb7f36b3cb Make TYPE_VPN_LEGACY no longer deprecated.
Addresses API council feedback.

Test: m
Fix: 185311050
Change-Id: I93c8c46ceda7b08f9fc0ab8930f6a3c960f30930
2021-04-14 23:30:48 +09:00
Benedict Wong
9dfb804a4e Convert VcnNetworkProvider to use NetworkOffers
This change brings VcnNetworkProvider to full functionality in the new
NetworkProvider paradigm, where NetworkProviders offer networks, and are
notified based on NetworkOfferCallbacks.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I88c69c0be9f6fd81839fb1595ed00341001694a5
2021-04-14 05:41:51 +00:00