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 "API review: Additional comment for QosSession." am: c8fadc5cde am: 925a785349 am: 64f0b4967f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: Ib0c56740d7007da4b0f58955c591db384258af66
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 11:20:46 +00:00
cfdbbf69f5
Merge "API review: Additional comment for QosSession." am: c8fadc5cde am: 925a785349
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: I7707784504c577422039b58c183285b64c84bd18
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 10:58:56 +00:00
64f0b4967f
Merge "API review: Additional comment for QosSession." am: c8fadc5cde am: 6786ff4984
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: I90ee83fd8e68317945238fd8e835a87dfe5851bd
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 10:58:55 +00:00
585ec3f1e2
Merge "API review: Additional comment for QosSession." am: c8fadc5cde
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: I7c749ba3323720ecfb9567e8c49671223c48217f
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 10:33:32 +00:00
6786ff4984
Merge "API review: Additional comment for QosSession." am: c8fadc5cde
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018921
Change-Id: Icb8c81cde2353058e9df3e2a1f2be26cfbf556af
Sewook Seo
authored and
Automerger Merge Worker
commited 2022-03-15 10:32:43 +00:00
925a785349
Merge "Update hidden API files for EthernetManager API move." into tm-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2022-03-15 10:22:28 +00:00
8007fbbfb9
Merge "API review: Additional comment for QosSession."
Sewook Seo
authored and
Gerrit Code Review
commited 2022-03-15 10:10:27 +00:00
c8fadc5cde
Merge "Add a NetworkAgent API to indicate that a network will be replaced." am: 9f6e6c4e27 am: 69856b3004 am: a3251c4a19
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: I029ebd5aec444b28bdc02b6f1541268ba1e88f75
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 06:01:40 +00:00
5cf5d44d03
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 am: 69856b3004
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: I9b1a8c4c0fd7e1917b4dd2b0e394a1532675cd11
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 05:37:50 +00:00
a3251c4a19
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." am: 9f6e6c4e27
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1987457
Change-Id: I52c048fc7c44a262e2539f4e68b7cefbfdc0a045
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-03-15 05:14:09 +00:00
69856b3004
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
Merge "Update system-current.txt and module-lib-current.txt to resolve API council comments" into tm-dev
Xinyi Zhou
authored and
Android (Google) Code Review
commited 2022-03-14 22:45:47 +00:00
74539fb52a
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
[automerger skipped] Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b am: 8d6635abe3 am: 967634c5a0 -s ours
...
am skip reason: Merged-In I80c8538372659a04145178fcc8e1af98e78e3681 with SHA-1 92b7040714 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019418
Change-Id: Iade625424e0adb34f5ade05bfaade50ba270b7af
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-14 10:12:09 +00:00
8689bbeaf8
Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b am: 8d6635abe3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019418
Change-Id: Ib1a0e7ffe82ae6cbfc4ac92f579fc03bd4a3902f
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-14 09:51:19 +00:00
967634c5a0
[automerger skipped] Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b am: 29de5272cc -s ours
...
am skip reason: Merged-In I80c8538372659a04145178fcc8e1af98e78e3681 with SHA-1 92b7040714 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019418
Change-Id: I3869ff7c6d5b9bee5257ce190948d9460bcbd2c3
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-14 09:51:09 +00:00
86a99b41d4
Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019418
Change-Id: I1958845346d847a14928f8ddc6174709144fe2fd
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-14 09:30:17 +00:00
8d6635abe3
Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" am: bcf3b1b58b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2019418
Change-Id: I94875309418fe10f9c094509710aacb19bfb127c
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-03-14 09:30:06 +00:00
29de5272cc
Merge "Rename "service-nearby" to "service-nearby-pre-jarjar""
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2022-03-14 09:07:43 +00:00
bcf3b1b58b
Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c am: fb8cdefc31 am: 1708b3cf37
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1998551
Change-Id: I57e9aa72d1e2e483223e66b6ce09764a24223155
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-14 09:06:27 +00:00
36dfb746bd
Merge "Rename redactNetworkCapabilitiesForPackage and update its javadoc" am: ba61dca57c am: fb8cdefc31
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1998551
Change-Id: I56aa9071f1390854618af184362ff0a7dc7378ee
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-14 08:43:57 +00:00
1708b3cf37
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: I07c10b58aa6be3aebbecbdc2cde91bda2086683e
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-03-14 08:22:33 +00:00
fb8cdefc31
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 "Fix the NPE thrown when starting Ethernet service in OS lower than T." into tm-dev
Xiao Ma
authored and
Android (Google) Code Review
commited 2022-03-14 05:16:24 +00:00
1f8ed3b2a6
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80 am: 6027930807 am: acb5f2166e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336
Change-Id: I942197839e762204e69beec2c09af38b8b4519b4
Frank Li
authored and
Automerger Merge Worker
commited 2022-03-14 03:42:41 +00:00
b52c1324a5
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80 am: c36cb655e5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336
Change-Id: Ibcafcd8e69e4179a984ebb0fdf5a211d11407c97
Frank Li
authored and
Automerger Merge Worker
commited 2022-03-14 03:32:29 +00:00
3f0e64da5a
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80 am: 6027930807
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336
Change-Id: Ifbf373ca746ce624415e0233d60043cece07ee65
Frank Li
authored and
Automerger Merge Worker
commited 2022-03-14 03:21:26 +00:00
acb5f2166e
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336
Change-Id: I70722dac5d4eb15deece4938a47b2d99fea04ec0
Frank Li
authored and
Automerger Merge Worker
commited 2022-03-14 02:59:58 +00:00
c36cb655e5
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2010336
Change-Id: I29e1411ea2e250f4caca971f6ad433c48133155a
Frank Li
authored and
Automerger Merge Worker
commited 2022-03-14 02:59:30 +00:00
6027930807
Merge "[DU09-3]Modify the NetworkStatsCollection Builder API"
Frank Li
authored and
Gerrit Code Review
commited 2022-03-14 02:36:08 +00:00
3f5703df80
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: 6ae67599f1 am: f2c84e7d75
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: I9658059f95e6b5f099c2de72b9b52e3e0868ed71
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 19:08:17 +00:00
92c17c3ba9
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: 6ae67599f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: I83c9a6bd5aac6292829130a918dff4090f4b417c
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:47:25 +00:00
f2c84e7d75
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: a7033ddecf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: Idcd5873236e7483786482ee0e3e234071685e0de
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:47:24 +00:00
c7b499505a
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: Ib299b5e06a01435b7f7e36486346cd198a026b21
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:26:15 +00:00
6ae67599f1
Merge changes I5af6ce96,Ibc1f6813 am: 3938102448
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1941933
Change-Id: I387852c0c1d451f0308bfd1cf683c80eae897efe
Nucca Chen
authored and
Automerger Merge Worker
commited 2022-03-11 18:26:04 +00:00
a7033ddecf
Merge changes I5af6ce96,Ibc1f6813
...
* changes:
Refactor make{Tether4Key, Tether4Value ConntrackEvent} helper
BpfCoordinatorTest: refactor upstream and downstream setup functions
Nucca Chen
authored and
Gerrit Code Review
commited 2022-03-11 18:05:14 +00:00
3938102448
Fix the NPE thrown when starting Ethernet service in OS lower than T.
...
Bug: 210586283
Bug: 223993229
Test: m
Ignore-AOSP-First: avoid merge conflicts
Change-Id: I5b61643cf99681e4db56468401e8670f90f9257e
Xiao Ma
commited 2022-03-12 00:15:02 +09:00
5f2fc97e80
Merge "API changes for addressing API Council comments." into tm-dev
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2022-03-11 01:51:36 +00:00
1523bf7eb4
API review: Additional comment for QosSession.
...
Additional comment on getSessionId in QosSession.
Bug: 216368595
Test: build
Change-Id: I0575253ef490e3d456e69816d52075c2d10813f0
sewookseo
authored and
Sewook Seo
commited 2022-03-10 22:28:15 +00:00
5f703feca1
Address API feedback: rename to AntispoofKey
...
[Antispoofkey and AntiSpoofkey should be AntispoofKey]
Bug: 218682005
Test: Unit Test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I5124094005d446293cc6cf980a60628e93080631
Chun Zhang
commited 2022-03-10 21:36:23 +00:00
ee379fd75a
Merge "Use U32 from shared library" am: 98502b78bc am: 259e42efc3 am: afc5230d69
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952114
Change-Id: I66afe5d0994264e3055050f00971f534afab9dfe
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-10 17:45:23 +00:00
b7f6d5875d
Merge "Use U32 from shared library" am: 98502b78bc am: 259e42efc3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952114
Change-Id: I03c968c61ac0be1695dc86df9cd21dc7942e3526
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-10 17:23:19 +00:00
afc5230d69
Merge "Use U32 from shared library" am: 98502b78bc am: c70b60c35e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952114
Change-Id: I507992b0da0a6177ce62c76c31919770d37d9e60
Mark Chien
authored and
Automerger Merge Worker
commited 2022-03-10 17:23:14 +00:00
7180050d29