Aaron Huang
e36801fe3d
[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a am: 929c1f171a am: 5d43332227 -s ours
...
am skip reason: skip tag Change-Id I77970b3a5e5e0e9d263639694b1f06519169bf64 with SHA-1 1fc20d4fa7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef
2021-04-01 13:47:59 +00:00
Aaron Huang
5d43332227
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a am: 929c1f171a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: Idc33279ef58a6c2bc971271ccf85cafa264b1d1d
2021-04-01 13:03:23 +00:00
Aaron Huang
929c1f171a
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I088dfe837eb986c2de792d0672a2e707112b6042
2021-04-01 12:21:47 +00:00
Aaron Huang
e36b232c4a
Merge "Move deduceRestrictedCapability to libs/net and rename it"
2021-04-01 11:37:51 +00:00
Chalard Jean
4ebc0197f2
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095 am: 4ac82f64c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb
2021-04-01 10:10:39 +00:00
Chalard Jean
4ac82f64c9
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a
2021-04-01 09:22:48 +00:00
Chalard Jean
86b272d81d
Merge changes Ib5cd2c27,I4448a354 into sc-dev
...
* changes:
[NS10] Fix a bug where registerIgnoringScore is broken
[NS09] Implement the new ranking code
2021-04-01 09:02:15 +00:00
Chalard Jean
b08d1c3095
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb
2021-04-01 08:44:55 +00:00
Chalard Jean
58b8d1eb22
Merge "Fix testLegacyLockdownVpn flaky"
2021-04-01 08:19:53 +00:00
Chalard Jean
8a30bb6048
Merge "Expose sendNetworkScore that takes a NetworkScore" into sc-dev
2021-04-01 07:17:48 +00:00
Chalard Jean
face022980
Fix testLegacyLockdownVpn flaky
...
When WiFi disconnects, the VPN disconnects immediately. The
broadcast can therefore be sent before the broadcast receiver is
registered, which causes the receiver to not see the broadcast.
The puzzling part is that CONNECTIVITY_ACTION is a sticky
broadcast, so one would expect the broadcast to still be
received, even if the registration is done after the broadcast
is sent. The reason this doesn't happen is that the context used
by the test is a BroadcastInterceptingContext, which does not
treat sticky broadcasts as sticky.
Bug: 184115648
Test: atest --iterations 1000 'ConnectivityServiceTest#testLegacyLockdownVpn'
Change-Id: Ib44c92839d25951cc7d2db0f923e1b104690e1e0
2021-04-01 06:27:46 +00:00
Chiachang Wang
bc779eb28b
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7 am: b1cdc09edc am: f5cd84594e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: Ibb523b767c246701d8024f618491c8a125beca18
2021-04-01 04:51:01 +00:00
James Mattis
43bebc4d19
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: eda48248c7 am: 2da0729ad5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Ic7bea025d69f3ea7f6388dfe6a01942cf5ae039d
2021-04-01 04:50:31 +00:00
Chiachang Wang
f5cd84594e
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7 am: b1cdc09edc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: I644bfe6309efb657e7ffd94445d3b26427f0c594
2021-04-01 04:00:33 +00:00
James Mattis
2da0729ad5
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: eda48248c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Id0258e1a468f4b33141f45420913d3276764b04e
2021-04-01 03:57:46 +00:00
Chiachang Wang
b1cdc09edc
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: Ie6f855ec7fd19a565344b817a60abdc5263a2cfa
2021-04-01 03:19:33 +00:00
James Mattis
eda48248c7
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Iec83a93593e52cdb2baf12fa76c70af9df263ee4
2021-04-01 03:15:42 +00:00
Chiachang Wang
5e3d0c85b7
Merge "Add required permission to FrameworksNetIntegrationTests"
2021-04-01 03:15:07 +00:00
Remi NGUYEN VAN
52f85bd486
Merge "Add framework-connectivity-test-defaults" into sc-dev
2021-04-01 02:43:26 +00:00
Suprabh Shukla
2adfd3ccb5
Add required permission to FrameworksNetIntegrationTests
...
Test: atest FrameworksNetIntegrationTests
Fixes: 184166194
Change-Id: I7ad920ba5962f9c71c3c3db86809e7cb6b934425
2021-03-31 18:52:04 -07:00
James Mattis
fdd2d3be95
Calling linkToDeath on binder in NRI constructor
...
Any NRI constructor that can possibly have a binder should call
linkToDeath on that binder if present. Not doing so can result in a
no such element exception when that NRI is removed.
Bug: 184155022
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: I90d594e43474483c554d0d315ff7abb6f678e093
2021-03-31 14:45:27 -07:00
Chalard Jean
b82a74b077
Expose sendNetworkScore that takes a NetworkScore
...
Bug: 167544279
Test: FrameworksNetTests
CTS-Coverage-Bug: 184037351
Change-Id: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78
2021-03-31 13:26:46 +00:00
Chalard Jean
e81dbd212a
[NS10] Fix a bug where registerIgnoringScore is broken
...
Fixes: 184028345
Test: ConnectivityServiceTest
Change-Id: Ib5cd2c27a2bd0f53b500e8edbe48126fbf58f34d
2021-03-31 20:59:50 +09:00
Chalard Jean
b887f60347
[NS09] Implement the new ranking code
...
At this stage, this is turned off. Unit tests will be
in a followup change.
Test: In a followup
Bug: 167544279
Change-Id: I4448a3546fbc1a3dddf757982c031c5f39ba2889
2021-03-31 20:59:47 +09:00
Chalard Jean
d7a91befe1
Merge changes Id7ee1bd3,I5ea44a94 into sc-dev
...
* changes:
[NS08] Expose public NetworkScore API
[NS07] Add the rest of the scoring policy
2021-03-31 11:42:19 +00:00
Remi NGUYEN VAN
db6feeab42
Add framework-connectivity-test-defaults
...
The defaults follow the same pattern as framework-wifi-test-defaults to
allow unit tests to build against hidden API in Connectivity.
Bug: 171540887
Test: m
Change-Id: I58bb6574f7e95053e4a95f76d1025506749ec2b8
2021-03-31 17:19:57 +08:00
James Mattis
cbb60163df
Merge "Change the const for the unreachable network" am: 07ff79a595 am: 5522ed6e3c am: 0aa2f9f8ec
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190
Change-Id: Id50d1e06f18830025eb30b420b4f6817028cf5c8
2021-03-31 04:23:02 +00:00
James Mattis
0aa2f9f8ec
Merge "Change the const for the unreachable network" am: 07ff79a595 am: 5522ed6e3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190
Change-Id: I848bc411f919991eb795372b64023f951e310e6a
2021-03-31 03:40:16 +00:00
James Mattis
5522ed6e3c
Merge "Change the const for the unreachable network" am: 07ff79a595
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190
Change-Id: I1e63766f07f3976abd36df117ffd3bf5ae1a8af4
2021-03-31 03:03:27 +00:00
James Mattis
9bdfa2c582
Change the const for the unreachable network
...
Changing the const used for the unreachable network for per-app
functionality for those apps whose traffic for the default network we
wish to lose connectivity as dictated by per app network preferences.
This is being done as per changes in https://r.android.com/1643182 .
Bug: 181579204
Test: atest FrameworksNetTests
Change-Id: I1bffadfa03a6221096100c9e0457ea00f94027a3
2021-03-30 17:16:44 -07:00
Lorenzo Colitti
5c88750cfc
Merge changes I24580ea4,Id48b8eab am: cbc6a315c5 am: ce1d32cd36 am: e4ef990c5d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763
Change-Id: I9d304c35374670eb0e4dcfb9caf6b065878d97e6
2021-03-30 18:33:04 +00:00
Lorenzo Colitti
e4ef990c5d
Merge changes I24580ea4,Id48b8eab am: cbc6a315c5 am: ce1d32cd36
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763
Change-Id: I8a7973e7ed4a8aac67d6f3da7c496a2eb0e28d92
2021-03-30 17:43:08 +00:00
Lorenzo Colitti
ce1d32cd36
Merge changes I24580ea4,Id48b8eab am: cbc6a315c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763
Change-Id: I3f90c94080e4d6f37cab3b5b43a0f5415fb50d8f
2021-03-30 17:09:01 +00:00
Lorenzo Colitti
cbc6a315c5
Merge changes I24580ea4,Id48b8eab
...
* changes:
Allow the system to register 250 NetworkCallbacks.
Add more test coverage for limiting the number of callbacks.
2021-03-30 16:01:58 +00:00
Chalard Jean
c44fa15b73
[NS08] Expose public NetworkScore API
...
This exposes the two bits settable by the network agents in
Android S on NetworkScore. This is meant to be extensible in
future releases, or possibly for OEM upstreams.
Test: builds
CTS-Coverage-Bug: 184037351
Bug: 167544279
Change-Id: Id7ee1bd3e2679f0bd5200d5c299f18a33b87847c
2021-03-30 23:54:19 +09:00
Chalard Jean
7851544cb5
[NS07] Add the rest of the scoring policy
...
Bug: 167544279
Test: FrameworksNetTests
Change-Id: I5ea44a94ac6f16486274e9091f15a84734db2341
2021-03-30 23:50:41 +09:00
Lorenzo Colitti
a610eede44
Merge "Add new network capabilities to support automotive head unit via USB" into sc-dev
2021-03-30 14:36:56 +00:00
Lorenzo Colitti
b4f8d8e130
Allow the system to register 250 NetworkCallbacks.
...
Give anyone with PERMISSION_MAINLINE_NETWORK_STACK (i.e.,
either the system or the networkstack process) a separate limit
of 250 callbacks per UID.
Bug: 183921387
Test: new unit tests
Change-Id: I24580ea48e3ad502ef584efc5fde0b5d22e392b4
2021-03-30 22:54:01 +09:00
Lorenzo Colitti
64ef4d3785
Add more test coverage for limiting the number of callbacks.
...
Bug: 183921387
Test: test-only change
Change-Id: Id48b8eab507fb616cb0adfeba52e00858d44b8a6
2021-03-30 20:28:36 +09:00
Treehugger Robot
79a5d34354
[automerger skipped] Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7 am: 41d68e4f4a am: 3b8caaa25f -s ours
...
am skip reason: skip tag Change-Id I3826b9efc3418a724bd3753b9ad573adc3343b72 with SHA-1 c9a448808b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654008
Change-Id: I81c4e3062f7546bf08f662e47cdbca63dae4d8fb
2021-03-30 09:46:04 +00:00
lucaslin
b794e348c0
[automerger skipped] Get NetworkCapabilities from NetworkCallback am: e14573d25e am: 4b3b6d68eb am: 04126c54f7 -s ours
...
am skip reason: skip tag Change-Id I91d68ca33253831b78def1ddeb074ba944a5d6ad with SHA-1 ad74ac58dd is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654007
Change-Id: I45456d55241bbbd6cda22cba93ab34c9c2ced176
2021-03-30 09:45:58 +00:00
Frank Li
199d6313e5
[automerger skipped] Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 0557b8b4c6 am: 7ea1bb7074 am: 044cdbe716 -s ours
...
am skip reason: skip tag Change-Id Ie6bc81ff382fb242b98f35d28a96defc207c7987 with SHA-1 b22da4e252 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628361
Change-Id: I8704e12681669b9a67a53cf2b80eb361f599229f
2021-03-30 09:44:24 +00:00
Treehugger Robot
3b8caaa25f
Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7 am: 41d68e4f4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654008
Change-Id: Ia10fe44c45f5dbaea808025210b7a287209b85dc
2021-03-30 09:02:35 +00:00
lucaslin
04126c54f7
Get NetworkCapabilities from NetworkCallback am: e14573d25e am: 4b3b6d68eb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654007
Change-Id: Ia7f09489370f943d9b6c063d819d5b0cdba1510a
2021-03-30 09:02:33 +00:00
Frank Li
044cdbe716
Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 0557b8b4c6 am: 7ea1bb7074
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628361
Change-Id: I7b4e289f13856f8015757d23a478fa923773d37a
2021-03-30 09:00:11 +00:00
Treehugger Robot
41d68e4f4a
Merge changes I3826b9ef,I91d68ca3 am: 364ad64fa7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654008
Change-Id: Iec425473511a1fe1f4b2bcf633e56ae1c76102c0
2021-03-30 08:35:20 +00:00
lucaslin
4b3b6d68eb
Get NetworkCapabilities from NetworkCallback am: e14573d25e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654007
Change-Id: I479d6b9564efee203ab2d2b6d1752d16c8b51cea
2021-03-30 08:32:37 +00:00
Treehugger Robot
364ad64fa7
Merge changes I3826b9ef,I91d68ca3
...
* changes:
Add static for constant
Get NetworkCapabilities from NetworkCallback
2021-03-30 08:22:41 +00:00
Frank Li
7ea1bb7074
Merge "[JS01]Remove hidden API usage of Connectivity Sevice" am: 0557b8b4c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628361
Change-Id: Ibc9e5b382c210e157f9af9c1071b2e2e1065320e
2021-03-30 08:03:56 +00:00
Frank Li
0557b8b4c6
Merge "[JS01]Remove hidden API usage of Connectivity Sevice"
2021-03-30 07:22:40 +00:00