Remi NGUYEN VAN
126dfaf776
Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5 am: cb58eb4732
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I52864a1dff894d827e97332ce9ddd506ae297270
2021-05-12 14:25:42 +00:00
Remi NGUYEN VAN
169d66303b
Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e am: ba0f6837cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icc10740c6f18755a86d4f3cc9fb59bcb6a933910
2021-05-12 14:25:23 +00:00
Remi NGUYEN VAN
32df5aa7bb
Merge "Build framework-connectivity using module_current" am: 40d3b1fbea am: 6e64634da0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I47046e76bab062d0f887f2f965c054054acba0c5
2021-05-12 14:25:00 +00:00
Remi NGUYEN VAN
cb58eb4732
Merge "Use jniThrowErrnoException from JNIHelp" am: 60ce73bdc5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703087
Change-Id: I6a1d75a1792883a7dc96c1beb108e83653c668a0
2021-05-12 14:17:28 +00:00
Remi NGUYEN VAN
ba0f6837cc
Merge "Move NetworkUtils JNI out of core/jni" am: 8842198f2e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703086
Change-Id: Icd812cda9e75015093080126bd20210034af5839
2021-05-12 14:13:20 +00:00
Remi NGUYEN VAN
6e64634da0
Merge "Build framework-connectivity using module_current" am: 40d3b1fbea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703085
Change-Id: I67461b530e5292f94e3e1426ff0ec93ea657cf21
2021-05-12 14:05:55 +00:00
Remi NGUYEN VAN
60ce73bdc5
Merge "Use jniThrowErrnoException from JNIHelp"
2021-05-12 13:12:32 +00:00
Remi NGUYEN VAN
8842198f2e
Merge "Move NetworkUtils JNI out of core/jni"
2021-05-12 13:12:09 +00:00
Remi NGUYEN VAN
40d3b1fbea
Merge "Build framework-connectivity using module_current"
2021-05-12 13:11:22 +00:00
Chiachang Wang
7e3fb2c18a
Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
2021-05-12 10:04:29 +00:00
Chiachang Wang
d37e995263
Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485
Change-Id: I858f2364a40d409981b88946887f9619f11cdce4
2021-05-12 09:57:07 +00:00
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
Chiachang Wang
536e82f56b
Merge "Remove sendNetworkConditionsBroadcast"
2021-05-12 09:24:02 +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
Remi NGUYEN VAN
bf0edd457f
Use jniThrowErrnoException from JNIHelp
...
Use the jniThrowErrnoException that is available in JNIHelp, instead of
reimplementing in NetworkUtils.
Bug: 179229316
Test: device boots and has connectivity
Merged-In: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994
Change-Id: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994
2021-05-11 14:18:27 +00:00
Remi NGUYEN VAN
40330008c3
Move NetworkUtils JNI out of core/jni
...
Keep the utilities included via a library, but move them out of
core/jni, and prepare a library to package them together with
framework-connectivity.
Also remove unnecessary dependencies in framework-connectivity.
Bug: 171540887
Test: device boots and has connectivity
Merged-In: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
Change-Id: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597
2021-05-11 13:02:39 +00:00
Remi NGUYEN VAN
472d13d498
Build framework-connectivity using module_current
...
framework-connectivity needs to build only against stable APIs.
Bug: 171540887
Test: m framework-connectivity.impl
Merged-In: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
Change-Id: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c
2021-05-11 13:00:42 +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
lucaslin
d6f8dbd75b
Remove sendNetworkConditionsBroadcast
...
sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.
Bug: 124415874
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
2021-05-11 09:25:54 +08: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