Sarah Chin
b50ae931f1
Merge "API to get network visible network capability name" am: 129857619f am: 7d29a97aa8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200
Change-Id: Ia6c65d6cd6d322d5599942ec65323a0d62e4dd1b
2021-04-02 17:56:48 +00:00
Sarah Chin
7d29a97aa8
Merge "API to get network visible network capability name" am: 129857619f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200
Change-Id: I7f8b909ec061d8bb875ff2688e2fb9a4cea54318
2021-04-02 17:45:29 +00:00
Sarah Chin
129857619f
Merge "API to get network visible network capability name"
2021-04-02 16:50:10 +00:00
Aaron Huang
0896806110
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650 am: 348a73f1f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
2021-04-01 16:45:22 +00:00
Aaron Huang
348a73f1f0
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: I1a21497634c2ee53abfca8dea4b8bab40cf28b3a
2021-04-01 16:25:44 +00:00
Aaron Huang
5c520a3650
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants"
2021-04-01 15:59:39 +00:00
Aaron Huang
224f95e57d
Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab am: f73b66fadf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
2021-04-01 13:04:07 +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
f73b66fadf
Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: I1e9d92cd27fc0dcd84cc62ad7c2a591c9f5a54e5
2021-04-01 12:26:04 +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
55a22edbab
Merge "Expose BIP and VSIM relavent definitions"
2021-04-01 11:38:17 +00:00
Aaron Huang
e36b232c4a
Merge "Move deduceRestrictedCapability to libs/net and rename it"
2021-04-01 11:37:51 +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
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
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
Aaron Huang
e3ea1200ad
Move some constants from TrafficStatsConstants to NetworkStackConstants
...
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.
Bug: 182349970
Test: FrameworksNetTests
NetworkStackTests
TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +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
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
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
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
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
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
lifr
d023f35cc3
[JS01]Remove hidden API usage of Connectivity Sevice
...
The Connectivity service will become the mainline module.
Therefore, remove the caller of using Connectivity's
hidden API outside the module and expose the required
connectivity API used in Jobscheduler.
Bug: 183456204
CTS-Coverage-Bug: 170598012
Test: atest JobStoreTest
Change-Id: Ie6bc81ff382fb242b98f35d28a96defc207c7987
Merged-In: Ie6bc81ff382fb242b98f35d28a96defc207c7987
(cherry-picked from ag/13946348)
2021-03-30 11:41:50 +08:00
Lorenzo Colitti
958a701738
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1 am: 8c9d2c1823
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262
Change-Id: I028d1f51c9685bcc7bcaabd0339b930aa46940c6
2021-03-30 01:58:24 +00:00
Lorenzo Colitti
8c9d2c1823
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262
Change-Id: Iab7a5cdb9d50314b0bdb982b88a9335b64ddb276
2021-03-30 01:14:09 +00:00
Lorenzo Colitti
2206e976c1
Merge changes If539cf5d,I9765f1c9,I6d3007a1
...
* changes:
Add test coverage for NetworkAgent callbacks.
Add a setTeardownDelayMs API to NetworkAgent.
Address comments on onBlockedStatusChanged(Network, int) CL.
2021-03-30 00:38:47 +00:00
Sudheer Shanka
b8d6d47bd5
Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: d5da6e7182
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550
Change-Id: I354cd41d18cfab87b1302d2dbd0ba5dcd10edca6
2021-03-29 16:57:17 +00:00
Sudheer Shanka
d5da6e7182
Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550
Change-Id: Ia95b11bcf91f18338b26146f6bb9488861555303
2021-03-29 16:19:05 +00:00
Sudheer Shanka
90358f5154
Remove NetworkPolicyManager.isUidBlocked() API.
...
It isn't used by ConnectivityService any more and even if
it needs such utility method in the future, we could create
one which is part of connectivity module and doesn't need
to be exposed as part of NetworkPolicyManager API surface.
Bug: 183696103
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
2021-03-29 12:39:12 +00:00
Lorenzo Colitti
1bc9ad0375
Add test coverage for NetworkAgent callbacks.
...
Tests the onNetworkCreated, onNetworkUnwanted and
onNetworkDisconnected callbacks, and the teardown delay timer.
Bug: 181941583
Test: atest --rerun-until-failure 500 ConnectivityServiceTest#testNetworkAgentCallbacks
Change-Id: If539cf5d01ba23193afab2433ed0ac4e7f0550ec
2021-03-29 21:33:11 +09:00
Lorenzo Colitti
6d88078151
Add a setTeardownDelayMs API to NetworkAgent.
...
This allows transports to request that when the network is
disconnected, the system should delay destroying the native
network until the specified time has passed after the network
disconnected.
Bug: 181941583
Test: next CL in the stack
Change-Id: I9765f1c9d1e55c23c6d583d6709dbe06505975b1
2021-03-29 21:33:08 +09:00
Frank Li
8b71e08ac6
Merge changes from topic "NetworkAgent02" am: 8539ed6fd2 am: b1d27c29ff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917
Change-Id: If099f376bfd5d456e938612005c4008b0beae91a
2021-03-29 12:14:01 +00:00