Merge "Rename setAccessUids to setAllowedUids" into tm-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2022-03-16 10:55:12 +00:00
bad4e7dbef
Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94 am: 50ade5403d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999
Change-Id: Ie7c3581e4bd0a6f2dd1f08c396494ccdbf1d7e72
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-03-16 09:30:01 +00:00
7c28fa6e4d
Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999
Change-Id: I892118930e9729c483523f8d337a76b28236c6c3
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-03-16 09:05:43 +00:00
50ade5403d
Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-03-16 08:36:28 +00:00
ef716bcb94
Rename setAccessUids to setAllowedUids
...
Bug: 217725769
Ignore-AOSP-First: Due to dependency on Telephony code which is not in
AOSP
Test: ConnectivityServiceTest CtsNetTestCases
Change-Id: I8860fbb353eedf5d01e9dc248e4d765046bd562c
Chalard Jean
authored and
Sooraj Sasindran
commited 2022-03-16 06:29:27 +00:00
7d72b41c95
Merge "Rename setUidForeground to noteUidForeground" am: 8b7896b51a am: cf9f545864
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880
Change-Id: I8a3ac0a4dcf9201435ad227b36acf4e0f1889f22
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-16 00:37:29 +00:00
f2975db5a4
Merge "Rename setUidForeground to noteUidForeground" am: 8b7896b51a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880
Change-Id: Ibcc236d2807da26a9aeae3eab6d6b10361a58cb5
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 23:57:57 +00:00
cf9f545864
Merge "Rename setUidForeground to noteUidForeground"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-03-15 23:33:26 +00:00
8b7896b51a
Merge "Add a NetworkAgent API to indicate that a network will be replaced." am: 9f6e6c4e27 am: 27987f4800
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: Ibc7bbc93db260ce5ab2606c077c8d6f5493b09fb
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 05:37:51 +00:00
fe0b6b8199
Merge "Add a NetworkAgent API to indicate that a network will be replaced." am: 9f6e6c4e27
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: Ic0993febcabeb115aa6728bfd3b74a17bdebf110
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 05:14:59 +00:00
27987f4800
Merge "Add a NetworkAgent API to indicate that a network will be replaced."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-03-15 04:44:16 +00:00
9f6e6c4e27
Add a NetworkAgent API to indicate that a network will be replaced.
...
This is useful for link layers that disconnect but know they will
reconnect to a similar network soon, and do not want the device
to switch to another network until the reconnect happens. An
example is wifi switching to another network that is on a
different subnet without the device switching to cellular data.
This works by immediately destroying the network, so the link
layer can reuse the same interface name for the new network. It
would be possible to delay destroying the network until the new
network connects, but in practice this does not seem useful,
because the if the link layer reuses the interface, then the
interface will be undergoing reconfiguration, and will likely
not be usable for app traffic.
This CL also moves the call to onNetworkDestroyed into
destroyNativeNetwork. This is needed to ensure that the new
API calls onNetworkDestroyed even though most teardown
operations have not happened. This causes onNetworkDestroyed to
happen before the netId is marked free, but that shouldn't cause
any behavioural changes because netId allocation is an
implementation detail of ConnectivityService and is not
observable by apps or system components.
Bug: 216567577
Test: builds, boots
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCases:android.net.cts.NetworkAgentTest#testDestroyAndAwaitReplacement
Change-Id: I9f9e022fef66b31a29cce560413321075e992756
Lorenzo Colitti
commited 2022-03-14 21:52:37 +09:00
ffa2ed3d1c
Ensure SpiUnavailableException was thrown because of duplicate SPI
...
SpiUnavailableException.getSpi() is public API so it should be tested.
Test: CtsNetTestCases:IpSecManagerTest
Change-Id: I68856b80b0ec819b0603dfe0a06ff813be3c5dda
Aaron Huang
commited 2022-03-14 20:06:59 +08:00
3c6cc0c4e1
Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c am: 32a4959ebe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1998551
Change-Id: I9d8d7fe3f471670a1819f213e0faf1fc6496e18f
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-14 08:43:57 +00:00
5b0af96fd9
Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1998551
Change-Id: Ib1baaabec99dd6ded27276b5838ce655b1c49ef1
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-14 08:22:22 +00:00
32a4959ebe
Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc"
Lucas Lin
authored and
Gerrit Code Review
commited 2022-03-14 08:05:08 +00:00
ba61dca57c
Merge changes from topic "ethernet-mainline-tm" into tm-dev
...
* changes:
Provide a stub ethernet service to build in sc-mainline-prod.
Build ethernet framework source into framework-connectivity-tiramisu
Lorenzo Colitti
authored and
Android (Google) Code Review
commited 2022-03-10 14:58:25 +00:00
cfc588ea62
Merge "Add test coverage for NetworkStats.Bucket#getRoaming()" am: 23f5e54efa
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2017915
Change-Id: Ieee7feb81bff9287a52f92fd799807bf8fea3d3c
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-03-10 12:32:10 +00:00
8751ae97b6
Merge "Add test coverage for NetworkStats.Bucket#getRoaming()"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-03-10 12:14:10 +00:00
23f5e54efa
Build ethernet framework source into framework-connectivity-tiramisu
...
- move ethernet APIs, build it into framework-connectivity-tiramisu
- start ethernet service from ConnectivityServiceInitializer
- fix EthernetManager dependnecy in Tethering module
- fix EthernetNetworkSpecifier dependency in framework-connectivity
- fix the ethernet related config resource
Bug: 210586283
Test: m
Test: atest FrameworksNetTests EthernetServiceTests
Ignore-AOSP-First: Topic of Ethernet Mainline has merge conflict with
master, merge this CL first and cherry-pick it back.
Change-Id: I54857b8517649048a343c72797668394d5225766
Xiao Ma
commited 2022-03-10 20:57:38 +09:00
eaaf7d3a83
Rename setUidForeground to noteUidForeground
...
Addresses API review feedback. Both setUidForeground in
NetworkStatsManager and NetworkStatsService are renamed to
noteUidForeground. Thus, the caller in test should be also
modified.
Bug: 222291301
Test: atest FrameworksNetTests
Change-Id: Ifa1e1af3d9fd8b1dc75a8f37947a5958f60ed415
Aaron Huang
commited 2022-03-10 18:33:50 +08:00
5417280f17
Merge "Add DisableConfigSyncTargetPreparer to CTS/MTS" am: 2aae895972 am: 24201c88b3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999078
Change-Id: Icdca158885f04b84d00ca05172693bc646fed518
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-10 10:27:39 +00:00
4fe9029eb7
Merge "Add DisableConfigSyncTargetPreparer to CTS/MTS" am: 2aae895972
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999078
Change-Id: I3820ae217fed1ddf6ec7bbb070d489e2ad438e57
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-10 10:04:31 +00:00
24201c88b3
Merge "Add DisableConfigSyncTargetPreparer to CTS/MTS"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2022-03-10 09:34:00 +00:00
2aae895972
Merge "cts: Re-launch the desired activity after screen-on on TVs." am: 422c7dd460 am: 821cd25be2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900117
Change-Id: Ib7a74c2d879d2989aa27c3703f65c0e344320711
Ross Yeh
authored and
Automerger Merge Worker
commited 2022-03-10 02:02:24 +00:00
fc46042f57
Merge "cts: Re-launch the desired activity after screen-on on TVs." am: 422c7dd460
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900117
Change-Id: I9f1b99857989fc0e938259ae8ed3d30cd36dfade
Ross Yeh
authored and
Automerger Merge Worker
commited 2022-03-10 01:39:36 +00:00
821cd25be2
Merge "cts: Re-launch the desired activity after screen-on on TVs."
Ross Yeh
authored and
Gerrit Code Review
commited 2022-03-10 01:13:37 +00:00
422c7dd460
Merge "Add test for EthernetNetworkUpdateRequest" am: 6758a5dfff am: 396091b4b1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2012897
Change-Id: I3caea7ea56c7b020c3a13ecfe5e8978960b37a88
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-03-09 10:12:36 +00:00
2f9ab72177
Merge "Add test for EthernetNetworkUpdateRequest" am: 6758a5dfff
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2012897
Change-Id: Ia159ef5459390bb49bb67be26022f942743a20ba
Patrick Rohr
authored and
Automerger Merge Worker
commited 2022-03-09 09:48:38 +00:00
396091b4b1
Merge "Add test for EthernetNetworkUpdateRequest"
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-03-09 09:16:29 +00:00
6758a5dfff
Add test coverage for NetworkStats.Bucket#getRoaming()
...
Bug: 217771804
Test: CtsNetTestCases
Change-Id: I16778488540476c2d1e77378a020c548eb894f0a
Merged-In: I16778488540476c2d1e77378a020c548eb894f0a
Aaron Huang
commited 2022-03-09 08:42:40 +00:00
fdbe9847a9
Merge "Split updateMeteredNetwork{Allow, Deny}List into add and remove" am: cc29690fc1 am: 9eb82805bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005313
Change-Id: Ie33ff8b5f6582005e59964d4c255f538e88441ef
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-09 05:45:14 +00:00
3b654e8781
Merge "Split updateMeteredNetwork{Allow, Deny}List into add and remove" am: cc29690fc1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2005313
Change-Id: Iafab628029f3c8bb6c3916912818625893980418
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-09 05:19:58 +00:00
9eb82805bc
Merge "Split updateMeteredNetwork{Allow, Deny}List into add and remove"
Mark Chien
authored and
Gerrit Code Review
commited 2022-03-09 05:00:58 +00:00
cc29690fc1
Split updateMeteredNetwork{Allow, Deny}List into add and remove
...
Split the updateXXX methods into an addXXX and removeXXX instead of using
a boolean parameter to indicate whether the uid should be added or removed
Bug: 218494748
Test: atest FrameworksNetTests
Change-Id: I868cf35c8f51b25d8719e618c6c48a5cd642da7f
markchien
commited 2022-03-09 11:17:27 +08:00
e46042b833
[Resolved conflict] Merge "Merge Android 12L" am: e6953d54a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2013399
Ignore-AOSP-First: automerger CL from AOSP
Change-Id: Ib5909fcd5078da0beaf399695bc25b28c4eb7918
Xin Li
commited 2022-03-08 17:13:34 +00:00
dc0aa2e9bf
Add test for EthernetNetworkUpdateRequest
...
Test: atest EthernetNetworkUpdateRequest
Change-Id: I2aeacca81f07cf2d73814d20fc9e63e9f1a65843
Patrick Rohr
commited 2022-03-08 16:29:43 +01:00
30d33f4ee3
Merge "Remove ConnectivityManager swapActiveStatsMap API" am: 5635d505e0 am: cab6183ca4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2002453
Change-Id: I4813a1fd9f78970e989dea3044c3d06163fb338d
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-08 07:31:38 +00:00
790f97cc6d
Merge "Remove ConnectivityManager swapActiveStatsMap API" am: 5635d505e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2002453
Change-Id: Id16667ee77babbaa13ac740853f16693cd1d54fb
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-08 06:57:00 +00:00
cab6183ca4
Merge "Merge Android 12L"
Xin Li
authored and
Gerrit Code Review
commited 2022-03-08 06:55:42 +00:00
e6953d54a5
Merge "Remove ConnectivityManager swapActiveStatsMap API"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-03-08 06:31:23 +00:00
5635d505e0
Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c am: c5f5bc136b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007090
Change-Id: I1688412e0796c261a18fdb3273a0f185fc93d870
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-03-08 01:45:21 +00:00
6aba5c87e4
Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2007090
Change-Id: I61c9c590cf2c6cf1afbd9f6898ad928199d16eaf
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-03-08 01:12:10 +00:00
c5f5bc136b
Merge changes Id5f5bdfc,I67b9f30b
...
* changes:
[CLATJ#32] ClatCoordinator: untag clat raw socket
[CLATJ#31] ClatCoordinator: tag raw socket to uid AID_CLAT
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-03-08 00:47:17 +00:00
984c39992c
Merge "Don't attempt to enable rate-limiting before T." am: 33f4e14073
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010337
Change-Id: If26026f57421c51eb34f38c82229fd524b734299
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-07 16:17:40 +00:00
23037308c6
Merge "Don't attempt to enable rate-limiting before T." am: 33f4e14073 am: 5349730cb2
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010337
Change-Id: If3117ad8e8d517a22c8cdf237fe1cb41d75ee414
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-07 16:08:07 +00:00
3940ca1bc1
Merge "Remove dead code in BpfNetMaps." am: e06458378d am: 8f35671e7e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2008696
Change-Id: I79f0349840021b075ebf5bd6c6575bd36b260a96
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-07 16:07:57 +00:00
c246c8248d
Merge "Don't attempt to enable rate-limiting before T." am: 33f4e14073
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010337
Change-Id: Icfb9ea592a272d41a781906f523f66ad5222076b
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-03-07 15:55:50 +00:00
5349730cb2
Merge "Don't attempt to enable rate-limiting before T."
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-03-07 15:51:32 +00:00
33f4e14073
Merge "Remove dead code in BpfNetMaps." am: e06458378d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2008696
Change-Id: I095832611b0b17c0f6158f2d5ea6e84f21cc9731
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-07 15:45:09 +00:00
8f35671e7e