Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 am: a0f346958f am: a87634a8b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682
Change-Id: I1974744d7b8993db44733f524811876b78c9007a
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-16 21:22:45 +00:00
0bdf717793
Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682
Change-Id: I26bc260ae6727e4e7d1a6053851681e0cee48631
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-16 20:35:23 +00:00
a0f346958f
Fix NetworkStatsServiceTest after adding deleteKernelTagData
...
Test: atest NetworkStatsServiceTest
Change-Id: I667a5d86e0df8505fef549e598f3b4141637fb90
Patrick Rohr
authored and
markchien
commited 2022-02-16 14:01:29 +08:00
7c52b69b3e
Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master
Xin Li
authored and
Android (Google) Code Review
commited 2022-02-14 17:31:19 +00:00
bfa7b1a197
Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4 am: 6973f87392
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649
Change-Id: Ia75e4ba89e54d72e24a4ce1f416ccfc2f3521d13
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-02-11 09:53:27 +00:00
43b566d4da
Merge "Refer to SDK constant defined in DevSdkIgnoreRule" am: 5be94579d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1981649
Change-Id: Ibeb9c3e828cc4bd3177ccfc5ef09d80155ed4781
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-02-11 09:33:53 +00:00
6973f87392
Merge "Refer to SDK constant defined in DevSdkIgnoreRule"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-02-11 09:23:02 +00:00
5be94579d4
Refer to SDK constant defined in DevSdkIgnoreRule
...
Refer to the same constant definition as other tests instead of
hard coding locally, so that it won't be missed as changing to
Build.VERSION_CODES.SC_V2.
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I3c17c414d830af03e2719c5dab1a664c55f6df2a
Chiachang Wang
commited 2022-02-11 07:40:58 +00:00
137bbed860
Merge sc-v2-dev-plus-aosp-without-vendor@8084891
...
Bug: 214455710
Merged-In: I5894450f3089b2ea105722a18ddf8f1eed1c28a0
Change-Id: If2045705da821c90705f7dd1e6944c0bb92e3289
Xin Li
commited 2022-02-11 06:57:49 +00:00
a459e6a12d
Merge "[SUBID01-1]Grow NetworkIdentity to include a new mSubId field"
Frank Li
authored and
Android (Google) Code Review
commited 2022-02-11 06:19:49 +00:00
9fd3ef39af
[SUBID01-1]Grow NetworkIdentity to include a new mSubId field
...
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.
This commit adds NetworkStats support for subscriberId as a part of
the network identity key
Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
NetworkStatsServiceTest NetworkIdentityTest
Ignore-AOSP-First: merge conflict resolutions
Change-Id: I8549b11d0fcfc5a9426724d6b90de27b707cb77c
lifr
authored and
Frank
commited 2022-02-10 22:51:56 +08:00
1f788606a0
Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992 am: e5dd237590
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392
Change-Id: I49a4825750040d8a4b67db9222f2e4f3131f564b
Robert Horvath
authored and
Automerger Merge Worker
commited 2022-02-10 11:54:25 +00:00
18499f63b2
Merge "Add Low Power Standby test to NetworkManagementServiceTest" am: 3a33495992
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963392
Change-Id: I42140d6ea97cec4899a6299373942ed8950e3f52
Robert Horvath
authored and
Automerger Merge Worker
commited 2022-02-10 11:30:34 +00:00
e5dd237590
Merge "Add Low Power Standby test to NetworkManagementServiceTest"
Robert Horvath
authored and
Gerrit Code Review
commited 2022-02-10 11:17:44 +00:00
3a33495992
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348
Change-Id: If7d654a347b562859389a171c1d36b82580f2038
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-02-10 01:39:12 +00:00
5ea7f1eb32
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348
Change-Id: Ib30cc33600acea119f68989287a1dbac5c63380f
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-02-10 01:04:20 +00:00
c1ae7a1047
Merge "Change naming of excludeLocalRoutes"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-02-10 00:50:30 +00:00
84ad04f768
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585
Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-09 18:33:22 +00:00
e5e904ee28
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585
Change-Id: I25ed7de950778a281bca5afd842126fccad3c7e0
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-02-09 18:16:08 +00:00
4eeea56e39
Merge changes from topic "bandwidth-limiting"
...
* changes:
Add bandwidth limiting to CS
Add setting that controls network rate limit
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-02-09 18:00:04 +00:00
6b5b7b40d8
Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa am: 33235c723e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860
Change-Id: I38dca22cff766fbe3cd458d6ee1ea706c549ace2
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-09 17:28:16 +00:00
d0c9e13ab2
Merge "Pass the NetworkAgentConfig to NetworkMonitor." am: ec05b337aa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1973860
Change-Id: I632b38bacd43ce03b95a163b4742b1a414b79012
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-09 17:12:02 +00:00
33235c723e
Add bandwidth limiting to CS
...
Adds ingress rate limiting functionality to ConnectivityService. The tc
rate limit is installed before we tell netd about the interface, and
removed after the network is removed from netd. When the setting
changes, the old rate limit needs to be removed before a new one can be
added (unfortunately, we cannot use NLM_F_REPLACE when configuring the
tc-police filter).
Currently, this functionality is always enabled, but may or may not work
based on kernel support.
Bug: 157552970
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: I4e64b2c40490f061e42b40a1b1b3a6618c3d1a87
Patrick Rohr
commited 2022-02-09 14:46:26 +01:00
2857ac4dd0
Merge changes Ie000244a,I3a55bc74
...
* changes:
Add test for NetworkTemplate.Builder#setRoaming(int)
Add NetworkTemplateTest to common test for cts coverage
Aaron Huang
authored and
Android (Google) Code Review
commited 2022-02-09 12:15:59 +00:00
addfdf5d7e
Merge "[MS83] Add Cts for NetworkStatsCollection/History builders"
Junyu Lai
authored and
Android (Google) Code Review
commited 2022-02-09 11:50:16 +00:00
b125c6f974
[MS83] Add Cts for NetworkStatsCollection/History builders
...
Test: 1. atest CtsNetTestCases:android.net.netstats.NetworkStatsHistoryTest
2. atest CtsNetTestCases:android.net.netstats.NetworkStatsCollectionTest
3. atest FrameworksNetTests
Ignore-AOSP-First: Required API is not in downstream yet
Bug: 218441356
Change-Id: If3d45325623cad987aab35f89c55f84042271adf
junyulai
commited 2022-02-09 17:18:19 +08:00
86fd7ea636
Merge "[MS68.4] Address comments at aosp/1958144"
Frank Li
authored and
Android (Google) Code Review
commited 2022-02-09 08:08:00 +00:00
3fc00212d7
Change naming of excludeLocalRoutes
...
Address API review feedback to change naming of
setExcludedLocalRoutesVpn and getter.
Bug: 217742354
Test: atest FrameworksNetTests
Change-Id: I57bbf55c7aba1c86ec8687d2431a50b37e63c6d0
Chiachang Wang
commited 2022-02-09 15:50:06 +08:00
f890874970
Add NetworkTemplateTest to common test for cts coverage
...
Test for NetworkTemplate.Builder
Ignore-AOSP-First: Required API is not in downstream yet
Bug: 215435701
Test: CtsNetTestCases
Change-Id: I3a55bc74388fa34a142abec308b67b185641c460
Aaron Huang
commited 2022-02-09 14:58:15 +08:00
d97e5a42d4
Merge "Add and implement API for VpnManagers to request validation" am: 4b66d4e244
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962981
Change-Id: I44774bd346326e827227ed06428df526d1491ca3
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-09 06:21:00 +00:00
1fdf2c9664
Pass the NetworkAgentConfig to NetworkMonitor.
...
When the network is a VPN, NetworkMonitor needs to know whether
the VPN requests validation, and that information is stored in
NetworkAgentConfig. Pass it.
Test: FrameworksNetTests
Change-Id: I3616f0796b69ce054d92213aafdef43ba7041596
Chalard Jean
commited 2022-02-09 15:19:38 +09:00
d490072cd6
Add and implement API for VpnManagers to request validation
...
This adds a new API that lets VPN apps using VpnManager request
that the platform run its basic validation check on the resulting
network.
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I00092eee857d3e33529b19461cfd5dd060a0fe20
Chiachang Wang
authored and
Chalard Jean
commited 2022-02-08 22:47:26 +09:00
865511a8c4
[MS68.4] Address comments at aosp/1958144
...
Test: atest TrafficStatsTest NetworkUsageStatsTest FrameworksNetTests
Bug: 204830222
Ignore-AOSP-First: merge conflict
Change-Id: I2578e13e2844591adac1d1902f2454ec7079ceea
Frank
commited 2022-02-08 16:23:51 +08:00
21d9760250
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator." am: d262e71965
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1970499
Change-Id: I5fadd544619ea315a16eed9cfa6b6e5a70e01cd6
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-04 16:53:37 +00:00
f3f151f798
Merge "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator."
Jean Chalard
authored and
Gerrit Code Review
commited 2022-02-04 16:40:30 +00:00
d262e71965
Merge "Add APIs for discover/resolve on specific networks" am: d61719c422
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944726
Change-Id: I5d6e69d78a54be962134d62262ec0938280ea8d0
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-02-04 12:18:44 +00:00
5baa9f74ca
Merge "Add APIs for discover/resolve on specific networks"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2022-02-04 12:07:38 +00:00
d61719c422
Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator.
...
Passing one of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED is
required for all code targeting T or above. The correct value
here is RECEIVER_NOT_EXPORTED because the receiver is being
registered in the system server and the broadcast comes from
the system server itself (same UID).
This does not need to be guarded by OS version because
CarrierPrivilegeAuthenticator is only used on T+.
Test: m
Fix: 217642082
Change-Id: I09840b17bd54352896607737b56c6a692ffbd2c2
Lorenzo Colitti
authored and
Chalard Jean
commited 2022-02-04 15:31:06 +09:00
7569d51446
Add APIs for discover/resolve on specific networks
...
Test that NsdManager specifies the correct network when a service is
discovered, and that services can be resolved on a specified network.
Also test that service discovery can be started on a specific network.
Bug: 190249673
Test: atest NsdManagerTest
Change-Id: Ie8b551ce9e33e3adf35f75508f91bbd0df71f837
Remi NGUYEN VAN
commited 2022-02-03 16:05:02 +09:00
06bdcec9fa
Add Low Power Standby test to NetworkManagementServiceTest
...
Bug: 190822356
Test: atest NetworkManagementServiceTest
Change-Id: I8ee0f5bc77efb94ba04957f68ec9b829d41bff83
Robert Horvath
commited 2022-02-02 22:54:21 +01:00
aa197190c6
Merge changes Ic6a1aa92,I685f924a,I50fab91e am: 2bc73d3b18
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1936492
Change-Id: Id1883f7c7209ad1e8ab5bd097467886d897116a2
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-02 07:54:21 +00:00
15d3140a33
Accept accessUids from telephony when it's the carrier config app
...
Test: FrameworksNetTests, new test in this patch
Change-Id: I50fab91e107c51d33a5e529c73b83db198a88d2c
Chalard Jean
commited 2022-02-02 13:52:25 +09:00
ac9ace0bbe
Merge "Clean up BpfNetMaps" am: d36de12652
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962620
Change-Id: I3351f56844a9b48ff4f77d2e7cc723102e255745
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-02-01 13:08:33 +00:00
33a41b8d64
Clean up BpfNetMaps
...
Cleans up BpfNetMaps.java before enabling mainline code path.
Bug: 202086915
Test: atest FrameworksNetTests
Change-Id: I28e5d63ed4624df540b1ca47b71899cff7321ded
Ken Chen
authored and
Patrick Rohr
commited 2022-02-01 12:31:03 +01:00
f5f51339af
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2 am: 76709a18e9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1966602
Change-Id: I172654f1eb824ce8a241ef3551d31b1385fa5365
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-02-01 03:17:27 +00:00
f0a36ba740
Merge changes Ifd6be50a,I857e40c9,I1b9f4fde,Ib3b43cf2
...
* changes:
Prevent native_init from starting TrafficController
Remove libutils dependency from libservice-connectivity
Merge libtraffic_controller_jni into libservice-connectivity
[NETD-TC#15] Make ConnectivityService and PermissionMonitor calls BpfNetMaps on T
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-02-01 03:02:36 +00:00
76709a18e9
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e am: 4fcb8ad292
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958935
Change-Id: I923bebc0438371fdc0a5d95d2a7a1485079a0b5a
Jean Chalard
authored and
Automerger Merge Worker
commited 2022-02-01 01:01:58 +00:00
5f780da415
Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e
...
* changes:
Expose access UIDs.
Send access UIDs to netd
Add accessUids to NetworkCapabilities.
Clean up restrictions on network agent capabilities
Sanitize NetworkCapabilities from agent on the handler thread
Jean Chalard
authored and
Gerrit Code Review
commited 2022-02-01 00:45:55 +00:00
4fcb8ad292
Merge "Fix kernelToTag import in NetworkStatsFactoryTest." am: d508855bb9
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1965521
Change-Id: I7dc3f917b38283eac67b7f9d2185355850857d52
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-01-31 14:04:01 +00:00
f99ca92278
Merge "Fix kernelToTag import in NetworkStatsFactoryTest."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-01-31 13:35:30 +00:00
d508855bb9
Patrick Rohr
authored and
Automerger Merge Worker
commited 
markchien
commited 
Xin Li
authored and
Android (Google) Code Review
commited 
Treehugger Robot
authored and
Gerrit Code Review
commited 
Chiachang Wang
commited 
Frank Li
authored and
Robert Horvath
authored and
Jean Chalard
authored and
Aaron Huang
authored and
Junyu Lai
authored and
Remi NGUYEN VAN
authored and
Lorenzo Colitti
authored and
Ken Chen
authored and
Maciej Żenczykowski
authored and