Commit Graph

13379 Commits

Author SHA1 Message Date
Lorenzo Colitti
bcede3e59b Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93 am: a50875391b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: I9b8a61b4c4a0059af294c2575e5339e7e3b9f3ed
2021-05-12 09:56:38 +00:00
Paul Hu
d59739e116 Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: I44318046f675749fe056fa253da3d48c88129441
2021-05-12 09:56:19 +00:00
Lorenzo Colitti
a50875391b Merge "Rename unwanted capabilities to forbidden capabilities." am: dacc5e5f93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687485

Change-Id: Iaf8da730305ed7294cc624d4d41b0a11f2872863
2021-05-12 09:15:30 +00:00
Lorenzo Colitti
dacc5e5f93 Merge "Rename unwanted capabilities to forbidden capabilities." 2021-05-12 09:00:17 +00:00
Paul Hu
8f03d96e83 Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: Ie4878f35faf62b15c95dc93951b9fa8f868642c4
2021-05-12 07:41:00 +00:00
Paul Hu
eda29f73aa Merge "Add MATCH_ANY_USER flag to PackageInfo queries" 2021-05-12 07:13:17 +00:00
David Su
197900e62e Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813 am: a7472710a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459

Change-Id: If641ab6d8ab300048c5666eea399e3ab8404d826
2021-05-11 16:48:03 +00:00
David Su
a7472710a5 Merge "Emphasize possibility of multiple networks with same transport" am: 74adc3a813
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620459

Change-Id: I5ce97c2040817b68c6b70640db22d5d04bb304f3
2021-05-11 16:10:55 +00:00
David Su
74adc3a813 Merge "Emphasize possibility of multiple networks with same transport" 2021-05-11 15:51:28 +00:00
Lorenzo Colitti
e1d928aff5 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-11 17:46:13 +09: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
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
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
paulhu
339d9beb1a Add missed break
Bug: none
Test: atest FrameworksNetTests
Change-Id: I8e8d0223de50c75732b06b053b3e60ccf4ef1684
2021-05-05 11:04:59 +08: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
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
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
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
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
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
paulhu
fe2e569d4e Add MATCH_ANY_USER flag to PackageInfo queries
- Querying PackageInfo should have MATCH_ANY_USER flag because
   some apps are only installed for specific users. If no flag,
   it will get NameNotFoundException.
- Also add missed break on switch case.

Bug: 186382373
Test: atests FrameworksNetTests
Change-Id: I37c8c42352a9a84ccbe9a37248febcd62b8f59e4
2021-04-26 19:03:20 +08: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
Remi NGUYEN VAN
dc48f786dd Merge "Use connectivity resources in service-connectivity" am: 41869c65a9 am: f8bb8efa5c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: I919b54b5527fbe3f9609c6ae70a31a651e4fda90
2021-04-23 06:36:06 +00:00
Remi NGUYEN VAN
c265e756ef Merge "Add AOSP certificates for connectivity resources" am: 2b41bf80ee am: 582734224c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ifa29b6c542a1b229d5fe32cf81c5189541af3f28
2021-04-23 06:35:34 +00:00
Remi NGUYEN VAN
f8bb8efa5c Merge "Use connectivity resources in service-connectivity" am: 41869c65a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646967

Change-Id: I2169a7c0c8b5eb1073789ffc115cdec73fbe3ab8
2021-04-23 06:10:14 +00:00
Remi NGUYEN VAN
582734224c Merge "Add AOSP certificates for connectivity resources" am: 2b41bf80ee
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684645

Change-Id: Ia8e130fe84aecefb29ee8eded1fa480517ac4ebf
2021-04-23 06:05:36 +00:00
Remi NGUYEN VAN
41869c65a9 Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Remi NGUYEN VAN
2b41bf80ee Merge "Add AOSP certificates for connectivity resources" 2021-04-23 05:40:58 +00:00
Chiachang Wang
2cd79f28d8 Address API review feedback
Address API review feedback to:
 - Rename NetworkAgent#setTeardownDelayMs to
   NetworkAgent#setTeardownDelayMillis
 - Use getters instead of fields in VpnTransportInfo
 - Rename registerDefaultNetworkCallbackAsUid to
   registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: make update-api
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-23 02:46:05 +00:00
Remi NGUYEN VAN
a4bef5d40b Use connectivity resources in service-connectivity
Migrate resource usage to the connectivity resource package.
For framework resources that have known overlays, keep a fallback until
the overlays can be migrated.

Bug: 182125649
Test: atest FrameworksNetTests
Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
(clean cherry-pick)

Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
2021-04-23 10:36:15 +09:00
Remi NGUYEN VAN
79f99a9bde Merge "Add QUERY_ALL_PACKAGES to net integration tests" am: 8acce32060 am: d291190b8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684407

Change-Id: I0eaf25ee34cea6dd9c5c20dcfd1c57f41c74a46c
2021-04-22 15:34:03 +00:00