Commit graph

53,649 commits

Message SHA1
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
[automerger skipped] Merge "DO NOT MERGE: Add stub class and filegroup for Ethernet service." into sc-mainline-prod am: 08ff0332f4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17197668

Change-Id: I07283ea9b298e179fab726c89b3179921621fbec

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-03-16 10:44:08 +00:00
d2c591e838
Merge changes from topic "presubmit-am-8d10f85b2c284afab94be3ffd6965825" into tm-dev
* changes:
  [automerged blank] DO NOT MERGE: Add stub class and filegroup for Ethernet service. 2p: 77f3dd80c2
  DO NOT MERGE: Add stub class and filegroup for Ethernet service.

Xiao Ma   authored and   Android (Google) Code Review   commited 2022-03-16 10:11:11 +00:00
3266efb317
Merge "DO NOT MERGE: Add stub class and filegroup for Ethernet service." into sc-mainline-prod
Xiao Ma   authored and   Android (Google) Code Review   commited 2022-03-16 10:11:11 +00:00
08ff0332f4
Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94 am: 93165a4497 am: 70405d6d22
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999

Change-Id: Ibf1f7a1247c4f0ea88fde12d88db93171df8f312

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-03-16 09:54:36 +00:00
c446fbf9be
Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94 am: 93165a4497
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999

Change-Id: I8683ed966c4d53960d5ed768f8466b3e9e23c59b

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-03-16 09:30:03 +00:00
70405d6d22
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" am: ef716bcb94
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999

Change-Id: I8e8c9caed3a14169d2b3de6de304ced3a7edbb02

Aaron Huang   authored and   Automerger Merge Worker   commited 2022-03-16 09:04:55 +00:00
93165a4497
Merge "Add a carrier config to block tethering." am: 1c12d0790e am: 49f5c7b9ab am: 553e363ddb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1967167

Change-Id: I5863cf464bcb0e3a215d7de5e7b6e3812fe78988

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-03-16 08:41:31 +00:00
275bd53704
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
Merge "Add a carrier config to block tethering." am: 1c12d0790e am: 49f5c7b9ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1967167

Change-Id: If303812111d7e9bccf1fcac0e1c88e959bab080d

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-03-16 08:19:32 +00:00
553e363ddb
Merge "Add a carrier config to block tethering." am: 1c12d0790e am: b9331a8fd1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1967167

Change-Id: I2d4726fb8a6a85a5ddf6646289e0ba308b3061a8

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-03-16 08:19:32 +00:00
e806405414
Merge "Add a carrier config to block tethering." am: 1c12d0790e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1967167

Change-Id: Icdd36a3e7325b11cefbb4962ec66e1a031b3a773

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-03-16 07:54:00 +00:00
b9331a8fd1
Merge "Add a carrier config to block tethering." am: 1c12d0790e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1967167

Change-Id: Ibd3983e68bb8381fd2faa18b83b3ea6734339c44

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-03-16 07:53:07 +00:00
49f5c7b9ab
Merge "Add a carrier config to block tethering."
Tom Hsu   authored and   Gerrit Code Review   commited 2022-03-16 07:26:39 +00:00
1c12d0790e
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
[automerged blank] DO NOT MERGE: Add stub class and filegroup for Ethernet service. 2p: 77f3dd80c2
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/17197668

Change-Id: Id6d97bd0fa04f7ea48a3494e9fe687d141f4259e

Presubmit Automerger Backend   commited 2022-03-16 05:44:46 +00:00
a116ad27ce
DO NOT MERGE: Add stub class and filegroup for Ethernet service.
Add stub classes EthernetService, EthernetServiceImpl and build stubs
for ethernet service updatable resource, which are required to ensure
ConnectivityServiceInitializer can build in the sc-mainline-prod.

Test: m service-connectivity
Test: cherry-pick the CL on p/m/Connectivity of ethernet-mainline topic
      and m com.android.tethering
Ignore-AOSP-First: needed in sc-mainline-prod only
Change-Id: I8a9e82250df61f1d47a3e7f5b3609cf459aeffb3

Xiao Ma   commited 2022-03-16 14:43:18 +09:00
77f3dd80c2
Add a carrier config to block tethering.
When KEY_CARRIER_SUPPORTS_TETHERING_BOOL=false, it will behave as if
entitlement check failed and a system notifcation shows up if user
tries to turn on tethering from Settings UI.

Bug: 161206517
Test: manual
Change-Id: I78da390ecb0c8f4f68285ef16da80653f136c11e

Meng Wang   authored and   tom hsu   commited 2022-03-16 12:40:24 +08:00
a84bb2d8ba
Merge "Remove the stub ethernet service from Connectivity module." into tm-dev
Xiao Ma   authored and   Android (Google) Code Review   commited 2022-03-16 03:47:23 +00:00
0eb6e8c0dd
Merge "Rename setUidForeground to noteUidForeground" am: 8b7896b51a am: 8e8833779d am: 457848d25c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880

Change-Id: I2aae7591172e14a9d59eedf7434cdd5a95b8319c

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-16 00:48:53 +00:00
a9cd25167d
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 am: 8e8833779d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880

Change-Id: Ia012d87fb5ca5129f2de36b16452de8106e6bc44

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-16 00:24:12 +00:00
457848d25c
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" am: 8b7896b51a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2018880

Change-Id: I4fd418208ef474730afcd7d7067eb330b7972910

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-03-15 23:57:31 +00:00
8e8833779d
Merge "Rename setUidForeground to noteUidForeground"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-03-15 23:33:26 +00:00
8b7896b51a
Remove the stub ethernet service from Connectivity module.
The stub ethernet service lib will be useless after removing all legacy
dependencies on ethernet-service.jar, so delete it from Connectivity
module as well.

Bug: 210586283
Test: m
Ignore-AOSP-First: avoid merge conflicts
Change-Id: Ica60df1140bf3f7345e61d642c9e9b706602c50b

Xiao Ma   commited 2022-03-15 22:53:10 +09:00
e2cc7ae495
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
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
[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