Commit Graph

14791 Commits

Author SHA1 Message Date
Chiachang Wang
c5c3bfb20e Replace clearAll with withoutDefaultCapabilities
As the feedback from API review, the clearAll method in Builder
does not match the actual usage. Thus, remove it and replace
with withoutDefaultCapabilities to provide clearer usage.

Bug: 184735772
Test: make update-api ; m
Change-Id: Ida8d25d57504864f046e3403f593cc606fbfe982
CTS-Coverage-Bug: 186061922
2021-05-14 14:53:47 +08:00
Benedict Wong
81370d77c3 Merge changes from topic "vcn-fwd" am: 57d20af2ea am: 7f55a7d6a3 am: 658556755c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
2021-05-11 06:10:32 +00:00
Benedict Wong
658556755c Merge changes from topic "vcn-fwd" am: 57d20af2ea am: 7f55a7d6a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I4e11bdfa3e887103673a354aad7f9b5fa746ac9e
2021-05-11 05:52:26 +00:00
Benedict Wong
7f55a7d6a3 Merge changes from topic "vcn-fwd" am: 57d20af2ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047

Change-Id: I7f02785727c73c27ac498ad4663f25252242c6e0
2021-05-11 05:26:46 +00:00
Benedict Wong
57d20af2ea Merge changes from topic "vcn-fwd"
* changes:
  Apply transform to FWD policy if configured to provide tethering
  Add internal support for IPsec forward policies
2021-05-11 01:30:31 +00:00
Chalard Jean
78ce5d79a9 Allow network providers to set yield to bad wifi
While the "yield to bad wifi" policy is handled by CS for
backward compatibility, the network provider should in
fact be in control of it. There is no downside to allowing
providers to set it as no provider is using this, and it
will allow for migration in the future. The code is also
simpler, and becomes possible to test through CTS.

Test: NetworkScoreTest
Bug: 184037351
Change-Id: I3b2418f37bf1f0374d0a626fda7e2b6f3a3b41ba
2021-05-10 08:55:19 +00:00
Paul Hu
2554c7f1a8 Merge "Add missed break" am: e01bb41ad7 am: 918f4d24b7 am: 506f002221
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: Ic1fe036bf1bb6429c361aa187347c06190b81b07
2021-05-10 02:34:35 +00:00
Paul Hu
506f002221 Merge "Add missed break" am: e01bb41ad7 am: 918f4d24b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: I418b1d529c40b687f4e2e1a895f993e49f215ac6
2021-05-10 02:15:43 +00:00
Paul Hu
918f4d24b7 Merge "Add missed break" am: e01bb41ad7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696667

Change-Id: Ib10bcffe1bbf74f38026ab62c40448ebf1181d08
2021-05-10 01:58:33 +00:00
Lorenzo Colitti
249c4e8a55 Merge "Rename unwanted capabilities to forbidden capabilities." into sc-dev 2021-05-09 16:12:56 +00:00
Benedict Wong
0a6585c58c Add internal support for IPsec forward policies
This change adds support for IPsec forward policies, which are necessary
for packets to be allowed to be forwarded to another interface, as is
the case with tethering. This is necessary and useful only within the
system server, and as such is not exposed as a public API.

This change is safe, since the addition of a FWD policy on IPsec tunnel
interfaces will by default block forwarded traffic (as would be the case
without this patch). In the event that the (system) owner of the tunnel
requires support for forwarded packets (eg tethering), this patch allows
application of transforms in the FWD direction as well.

This will be used to ensure that the VCN can be used as the underlying
network for the purposes of tethering.

Bug: 185495453
Test: atest IpSecServiceTest
Test: atest IpSecServiceParameterizedTest
Test: manual testing with tethering over VCN
Change-Id: I74ecea71f1954029f6fbdbe34598c82e0aac386b
2021-05-07 15:09:42 -07:00
Lorenzo Colitti
56a0ecab32 Rename unwanted capabilities to forbidden capabilities.
Addresses API council feedback.

Bug: 184890428
Test: atest FrameworksNetTests CtsNetTestCases
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest on R device
Change-Id: Id7c68fbf56ee08fcad8e8e3aacf037fa1885936b
2021-05-08 01:48:01 +09:00
Lucas Lin
4c6045e033 Merge "Remove sendNetworkConditionsBroadcast" into mainline-prod am: 8a9e884d02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271579

Change-Id: I394ab3ceee1685c4fdabd27f8377a2f3227c33be
2021-05-07 08:59:26 +00:00
paulhu
339d9beb1a Add missed break
Bug: none
Test: atest FrameworksNetTests
Change-Id: I8e8d0223de50c75732b06b053b3e60ccf4ef1684
2021-05-05 11:04:59 +08:00
Junyu Lai
050f198ec0 Merge "Add doc to getNetworkCapabilities" am: bf213ad25f am: aaadd384e9 am: 026c310600
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I0c41878350ffe4015fe9e6034651f50366503dfe
2021-05-03 04:06:34 +00:00
Junyu Lai
026c310600 Merge "Add doc to getNetworkCapabilities" am: bf213ad25f am: aaadd384e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: Iab7908bbeb3fd58599d7702e44450a4224a78f5b
2021-05-03 03:50:18 +00:00
Junyu Lai
aaadd384e9 Merge "Add doc to getNetworkCapabilities" am: bf213ad25f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I81c764ca04e3a300272ba18faa35d9fb0ecb54b1
2021-05-03 03:34:22 +00:00
Junyu Lai
bf213ad25f Merge "Add doc to getNetworkCapabilities" 2021-05-03 03:16:24 +00:00
Chalard Jean
39b21a3751 Add doc to getNetworkCapabilities
Test: doc-only change
Fixes: 158092418
Change-Id: Ic20fb55e1bdd4e836468794d1f86d3e9d0bc5965
2021-04-30 11:24:00 +00:00
TreeHugger Robot
2534f6b916 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-29 18:34:49 +00:00
Bill Yi
a7cf2c97a7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7f1f328ec7a68bc9219f11fffc32b650de1a3bf3
2021-04-29 13:56:51 +00:00
Treehugger Robot
bb5f8b794f [automerger skipped] Merge "Add getters to NetworkStateSnapshot" am: 1c9a1c1353 am: 18e5c6bd73 am: 168985a811 -s ours
am skip reason: Merged-In Id1707753b42ae88d2b95e4bd00a792609434e4f5 with SHA-1 c8081e954e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: Ice81dc86428db24ce535ad052e5b594e18d401b8
2021-04-29 10:26:50 +00:00
Treehugger Robot
168985a811 Merge "Add getters to NetworkStateSnapshot" am: 1c9a1c1353 am: 18e5c6bd73
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: Ia6047f77624d6be82dc2528f52f7c77bf5b29c17
2021-04-29 10:02:43 +00:00
Treehugger Robot
18e5c6bd73 Merge "Add getters to NetworkStateSnapshot" am: 1c9a1c1353
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684649

Change-Id: I3263514a5d75141c81e5f9d7389603ed369e95df
2021-04-29 09:39:19 +00:00
Treehugger Robot
52c1b5f232 [automerger skipped] Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc am: 6748a5655a am: 2d40a7c450 -s ours
am skip reason: Merged-In Id59744097208d91298a25ef110ade91a9cf291a1 with SHA-1 9a2db307ba is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I9ac1f63c16debb8269b240380257bffd934021d1
2021-04-29 09:23:49 +00:00
Treehugger Robot
1c9a1c1353 Merge "Add getters to NetworkStateSnapshot" 2021-04-29 09:20:34 +00:00
Treehugger Robot
2d40a7c450 Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc am: 6748a5655a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I33d2bbca5a72ab8500a7886073c9f4c4d1b84925
2021-04-29 08:57:50 +00:00
Treehugger Robot
6748a5655a Merge "Add getters to UnderlyingNetworkInfo" am: 3cf9eef4cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684651

Change-Id: I97222bb04bdea78178741245016658cad7f082dc
2021-04-29 08:16:36 +00:00
Treehugger Robot
3cf9eef4cc Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +00:00
Treehugger Robot
5cee40d7f0 [automerger skipped] Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 416a37f7f8 am: 1ce31a69c0 am: c4942aa49c -s ours
am skip reason: Merged-In Ic18d17d05984fa2466c962c7843c0ef7183ce77c with SHA-1 20605e540a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: Ica9ed0e1d93f46da1d012e2e5a6c9ade0863a9fc
2021-04-29 05:45:59 +00:00
Treehugger Robot
c4942aa49c Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 416a37f7f8 am: 1ce31a69c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: I0fa34d7cddaede25898d262196804bdd327caf8e
2021-04-29 05:28:28 +00:00
Treehugger Robot
1ce31a69c0 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" am: 416a37f7f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684034

Change-Id: Ie83813d57b678de4f60fe8e70aa1aa42d74a0bc8
2021-04-29 05:07:31 +00:00
Treehugger Robot
416a37f7f8 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Aaron Huang
aa601c3bf1 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
Lorenzo Colitti
b612fb41de 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
Lucas Lin
c2a7e6745c Merge "Update PrivateDnsMode from StringDef to IntDef" into sc-dev 2021-04-27 06:03:14 +00:00
Les Lee
b9844bee52 Merge "wifi data usage: support to get carrier merged wifi network." am: 8eb01a8a7e am: 1b73eabbce am: 9dd6c5a31e
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
9dd6c5a31e Merge "wifi data usage: support to get carrier merged wifi network." am: 8eb01a8a7e am: 1b73eabbce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: Ia115b6c8fe536d77071744374f5d42390cc50dbd
2021-04-27 04:13:08 +00:00
Les Lee
1b73eabbce Merge "wifi data usage: support to get carrier merged wifi network." am: 8eb01a8a7e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743

Change-Id: I01b6790de48a514256f51ebb85226e56c6e2f59b
2021-04-27 03:26:31 +00:00
Les Lee
8eb01a8a7e Merge "wifi data usage: support to get carrier merged wifi network." 2021-04-27 02:13:32 +00:00
James Mattis
5189d3de9a [automerger skipped] Merge "Changing per-app default request to TRACK_DEFAULT" am: 4a57fe5c2b am: 9aba2cb910 am: 79e37b02c1 -s ours
am skip reason: skip tag Change-Id I312e55a54f70aa82953a32ab9369d5afc02b75e5 with SHA-1 6402e58bc3 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: Ib805026108c1cb2afd04c6655c2f7092446009aa
2021-04-26 16:07:06 +00:00
James Mattis
79e37b02c1 Merge "Changing per-app default request to TRACK_DEFAULT" am: 4a57fe5c2b am: 9aba2cb910
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I16f4bc417880aeef53a17cb1830666b5fefe5889
2021-04-26 15:42:37 +00:00
James Mattis
9aba2cb910 Merge "Changing per-app default request to TRACK_DEFAULT" am: 4a57fe5c2b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682063

Change-Id: I9632d12c85cc7d0c7d3c80333fdfba7ff024bff2
2021-04-26 15:07:48 +00:00
James Mattis
4a57fe5c2b Merge "Changing per-app default request to TRACK_DEFAULT" 2021-04-26 14:39:44 +00:00
Chiachang Wang
837460cb74 [automerger skipped] Merge "Address API review feedback" am: 14a74d0c62 am: e9bee72082 am: d0b9b6a227 -s ours
am skip reason: skip tag Change-Id I5e8c4bed8bda40d507afa894c359b5e24ee5d868 with SHA-1 2e98f6cd57 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I859b0bd64ce3c38693e19209783bcdf91a562ef2
2021-04-26 01:34:33 +00:00
Chiachang Wang
d0b9b6a227 Merge "Address API review feedback" am: 14a74d0c62 am: e9bee72082
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
2021-04-26 01:15:12 +00:00
Chiachang Wang
e9bee72082 Merge "Address API review feedback" am: 14a74d0c62
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I7a454e891edf3177bd87f041473f2749d3ee309f
2021-04-26 00:43:15 +00:00
Chiachang Wang
14a74d0c62 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
James Mattis
0abefa739d Changing per-app default request to TRACK_DEFAULT
Changing the per-app default request flows to fallback to a request of
type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this
change is that these requests will no longer be sent to the factories
which is desired.

Bug: 180452284
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
Merged-In: I312e55a54f70aa82953a32ab9369d5afc02b75e5
2021-04-23 07:47:11 -07:00
James Mattis
424b59c392 Merge changes I5125755b,I312e55a5 into sc-dev
* changes:
  Updating tests to honor per-app TRACK_DEFAULT
  Changing per-app default request to TRACK_DEFAULT
2021-04-23 14:42:51 +00:00