Commit Graph

28938 Commits

Author SHA1 Message Date
TreeHugger Robot
a58037af96 Merge "Require location permission for ConnDiags WiFi only." into sc-dev am: 8e345e9637
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14885895

Change-Id: Id07bf1a5714a717176d003758fdf9b31fde0833a
2021-06-08 15:32:49 +00:00
TreeHugger Robot
8e345e9637 Merge "Require location permission for ConnDiags WiFi only." into sc-dev 2021-06-08 15:18:54 +00:00
Anton Hansson
f61dc66a91 Add tethering bootclasspath fragment to its sdk am: 3669599dec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14881273

Change-Id: Ib4b4fc6e684f30a1bb9e1d27813274e7701ceeaf
2021-06-08 09:18:34 +00:00
Treehugger Robot
27b6888364 Require location permission for ConnDiags WiFi only.
This CL updates ConnectivityDiagnostics permission checks in
ConnectivityService to only require location permission for Networks
that have TRANSPORT_WIFI. This change is consistent with the location
restrictions required for the transports themselves. Previously,
location permissions were required for all Network types.

Bug: 187310575
Test: atest ConnectivityServiceTest ConnectivityDiagnosticsManagerTest
Change-Id: I48806533e4e705d2d9be45f3b3d3931d9294b167
Merged-In: I48806533e4e705d2d9be45f3b3d3931d9294b167
(cherry picked from commit 0990af5148)
2021-06-07 22:17:05 +00:00
Anton Hansson
3669599dec Add tethering bootclasspath fragment to its sdk
This subsumes the java_sdk_library in the sdk.

Bug: 188427719
Test: build_mainline_modules.sh
Change-Id: Ib2ebb3893135b4dd91812f1f1b0915540cfd64cb
2021-06-07 15:46:33 +01:00
Nikita Ioffe
9f59763887 Merge "Mark tethering apex as compressible" into sc-dev am: 8148656efc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14748198

Change-Id: I63b46890d67d85972a4d5ad0700d2917828f9fb6
2021-06-07 11:30:26 +00:00
Nikita Ioffe
8148656efc Merge "Mark tethering apex as compressible" into sc-dev 2021-06-07 11:13:35 +00:00
Paul Hu
6c3f2ea641 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev am: 48fc715694
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772857

Change-Id: I1d74e05699d3ccaf882b9f8cc9d78ac39dd4483c
2021-06-07 09:50:24 +00:00
Paul Hu
48fc715694 Merge "Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting" into sc-dev 2021-06-07 09:29:56 +00:00
Paul Hu
b9d5a0b545 Merge "Address leftover comments" into sc-dev am: 9a8e4497a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14772851

Change-Id: Ie3e82c84cdfe8a9ea6a01859501f67ea472bc969
2021-06-07 09:03:47 +00:00
Paul Hu
9a8e4497a3 Merge "Address leftover comments" into sc-dev 2021-06-07 08:50:21 +00:00
Chiachang Wang
1c016b7f07 Add test for ConnectivityManager.factoryReset am: 3d60a42323
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840205

Change-Id: Ib7edfb23781ad9ca3a2f8b4d3847f1ed9b58e4fd
2021-06-07 04:15:49 +00:00
Chiachang Wang
431ca78158 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported am: 0acaa74538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14840204

Change-Id: I4ea2374e8b1ce0a7bba540ebef93b222687790e9
2021-06-07 04:15:06 +00:00
Chiachang Wang
3d60a42323 Add test for ConnectivityManager.factoryReset
Bug: 186061922
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Test: atest CtsNetTestCasesLatestSdk on R and S device
Merged-In: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
Change-Id: I5d3e448ed00b9baeb64a08036ecac1f9c8206cc7
2021-06-04 13:29:54 +00:00
Chiachang Wang
0acaa74538 Correct the logic for CtsTetheringUtils.isWifiTetheringSupported
The existing isWifiTetheringSupported only check if tethering side
supports wifi tethering or not but not wifi side. A expected
behavior should include both of them, so add the wifi side check
into the helper function. Also update in the existing caller side
due to a new parameter added.

Bug: 186061922
Test: atest MtsTetheringTestLatestSdk
Megred-In: Id69ac1d30ab2bbf23e870193335b139f54672636
Change-Id: Id69ac1d30ab2bbf23e870193335b139f54672636
Ignore-AOSP-First: cherry-pick
2021-06-04 13:29:38 +00:00
Paul Hu
44bfe2d4c0 Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015

Change-Id: Ic0b248bc137b694aed5fcfc1766093c85ed61711
2021-06-04 09:15:22 +00:00
Paul Hu
87f2897f90 Merge "Implement mobile data preferred uids feature" into sc-dev 2021-06-04 08:55:31 +00:00
Aaron Huang
d80dfe936b Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888

Change-Id: Idba65290a50bf4ab2f2fafa135fdcf0f8a4fa3e7
2021-06-03 06:14:47 +00:00
TreeHugger Robot
ce42528d72 Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540

Change-Id: I0de545e1e475d128919e06ef0a9398722d608b67
2021-06-03 06:14:33 +00:00
Chiachang Wang
40eec1eaf9 Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912

Change-Id: Ibcfb16860cf6e2606ad41607d64c5d8533372855
2021-06-03 06:14:26 +00:00
TreeHugger Robot
00c47e1c5a Merge "Fix memory access violation in NetworkStack" into sc-dev am: 1dc094b2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14713334

Change-Id: Ie1eca928523704673fb42870df01644b215252de
2021-06-03 06:14:12 +00:00
Remi NGUYEN VAN
9fc5a2653c Skip merge of: Merge fixed history of Connectivity
This merges commit 1af06c78df with
"-s ours"

Bug: 186628461
Test: TH
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: I5fd3b9c2686f9261166ef8e16ce8d55e1eff2cd7
2021-06-03 11:00:24 +09:00
Remi NGUYEN VAN
8c05c9ec88 Merge fixed history of Connectivity
Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: Id42a562cfaccc4bf0bae8a40635777841ed6d232
2021-06-03 10:43:01 +09:00
paulhu
71ad4f1175 Implement mobile data preferred uids feature
- Read MOBILE_DATA_PREFERRED_UIDS setting when system ready
- Register MOBILE_DATA_PREFERRED_UIDS setting observer
- Send uid ranges to netd when update mobile data preferred uids

Bug: 171872461
Test: atest FrameworksNetTests
Ignore-AOSP-First: Needs cherry-picks
Change-Id: I5153c770650594e05dfa8cf230d7381d790f4a55
2021-06-02 15:40:53 +08:00
paulhu
a1ac564748 Move UIDS_ALLOWED_ON_RESTRICTED_NETWORKS setting
Now, PermissionMonitor reigster observer to listen the change
from all users, but "uids allowed on restricted networks" should
affect to all users instead of per each user. Thus, move the
setting from Settings.Secure to Settings.Global.

Bug: 189705071
Test: atest FrameworksNetTests
Ignore-AOSP-First: Need cherry-pick
Change-Id: Ibea354d8dda1f02652a193820f3f9eb573b9a956
2021-06-01 21:28:34 +08:00
paulhu
5d8340f7ae Address leftover comments
- Add comment to highestPermissionForUid()
- Add testAppsAllowedOnRestrictedNetworksChangedMultipleUsers
- Add synchronized to guard mUidsAllowedOnRestrictedNetworks
  access.

Bug: 189705071
Test: atest FrameworksNetTests
Ignore-AOSP-First: Need cherry-pick
Change-Id: I9056758db15e8a21b84ef244d4cacf24c3b79894
2021-06-01 19:04:28 +08:00
Aaron Huang
059ddb4025 Merge "Remove framework-connectivity-annotations library" into sc-dev 2021-06-01 08:08:21 +00:00
TreeHugger Robot
98c351f429 Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev
* changes:
  Add CTS for NetworkScore.setTransportPrimary
  Add some CTS tests for NetworkScore.
  Add a first CTS for NetworkScore
2021-06-01 07:41:17 +00:00
Aaron Huang
cff22949d2 Remove framework-connectivity-annotations library
This library can be removed because the annotations are no longer
used out of module.

@RestrictBackgroundStatus and @MultipathPreference are defined
in connectivity mainline module. Annotate these in non-updatable
platform is not going to be manageable long term. For example,
if the module gets updated and the annotation gets more values
then it's a problem in non-updatable platform. So, it should
not have IntDef cross module boundaries.

Ignore-AOSP-First: AOSP doesn't include this change yet
Bug: 183972925
Test: build
Change-Id: I63f1fde73c4ffdaff9fda914e33cbb5a110ba64e
2021-06-01 06:47:47 +00:00
Chalard Jean
ee93b3d3b3 Add CTS for NetworkScore.setTransportPrimary
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I81bf8969ace3cb6826b30c5bbd0b896c64c73c57
2021-06-01 02:20:57 +00:00
Chalard Jean
2d2ecc3cfb Add some CTS tests for NetworkScore.
Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: I2edba51351cd4c71727663aa85b1d5141bff2a15
2021-06-01 02:20:54 +00:00
Chalard Jean
aac204b202 Add a first CTS for NetworkScore
In an effort to make reviewing easier, this implements most of
the infra but only a mostly trivial test.

Ignore-AOSP-First: NetworkScore incomplete in AOSP
Bug: 184037351
Test: this
Change-Id: Ibb9139798ce44d748e87bae79a1e23311ec8d9b6
2021-06-01 02:20:26 +00:00
Chiachang Wang
1084882539 Merge "Unify the verification for unregister a NetworkAgent" into sc-dev 2021-06-01 02:09:37 +00:00
TreeHugger Robot
1dc094b2c0 Merge "Fix memory access violation in NetworkStack" into sc-dev 2021-05-31 08:02:13 +00:00
Robert Greenwalt
db5cb3ac11 am 4ad1f0d3: (-s ours) Merge "Add a new IpPrefix class and use it in RouteInfo." into lmp-preview-dev am: 76386ba02e
Original change: undetermined

Change-Id: I95c94a56310b861fd21a2481579cffb82ff8bb75
2021-05-31 07:57:42 +00:00
Robert Greenwalt
5e7f23dc53 am 558aeb90: Merge "Make NetworkCapabilities publicly immutable." into lmp-preview-dev am: 5c716c26d6
Original change: undetermined

Change-Id: I4230d112d4b22fcb4afaddbd5dcaedc7ad96e600
2021-05-31 07:57:28 +00:00
Robert Greenwalt
864a055ff2 am fe5ca964: (-s ours) Merge "Fix public API of LinkProperties." into lmp-preview-dev am: ce639b70ab
Original change: undetermined

Change-Id: I39a94e4ae62c35c3c9baf3ffee199d8cddb24e14
2021-05-31 07:57:14 +00:00
Sreeram Ramachandran
67172b2912 Fix wifi connectivity issues. am: 78ed25af23
Original change: undetermined

Change-Id: I2338ed09b4b804204ea1f0f44ad0e9329492cd3c
2021-05-31 07:57:01 +00:00
Robert Greenwalt
ba2e28565f am bcf103d0: Merge "Apply API review to android.net.Network:" into lmp-preview-dev am: 0134277a2e
Original change: undetermined

Change-Id: I3dfa4ae428091e47e1c7b2886635c8f598e2fa33
2021-05-31 07:56:46 +00:00
Lorenzo Colitti
6ee032994e Minor changes to the LinkAddress API docs. am: 48a7da0258
Original change: undetermined

Change-Id: I26d44c925e78037bb9974cccd01d1e94d5938383
2021-05-31 07:56:32 +00:00
Sreeram Ramachandran
1d5cda9d6e Add a new IpPrefix class and use it in RouteInfo. am: 8162a5ef8b
Original change: undetermined

Change-Id: Ibf58069e6536618eee575da33ab0d46e248d8625
2021-05-31 07:56:19 +00:00
Amit Mahajan
1e331de08d resolved conflicts for merge of 253b06e6 to master am: d032de432e
Original change: undetermined

Change-Id: I4a39dd81cbb1d5b9f168097684546bb0b61b8704
2021-05-31 07:56:04 +00:00
vandwalle
69ed4ff90b Merge "remember and report network score" am: e472bf0970
Original change: undetermined

Change-Id: I4cf7cf0191e6dad4d6122145d8b1d690c0679e7c
2021-05-31 07:55:51 +00:00
Robert Greenwalt
5779528d4a Merge "Apply API review to android.net.Network:" am: c9104d4795
Original change: undetermined

Change-Id: Iad838123adf7c25bb18fbdef800509aa03b633c1
2021-05-31 07:55:28 +00:00
Robert Greenwalt
39345c42b3 Fix public API of LinkProperties. am: bbcebb79ae
Original change: undetermined

Change-Id: Ic88f5a571c9420c77cab6e1dcaa58e38eed6357d
2021-05-31 07:55:05 +00:00
Robert Greenwalt
eedb9d9c61 Fix the marking of restricted network requests am: 505660a316
Original change: undetermined

Change-Id: Iabb54a8d38ce291e7568909f9eae31b71d8d9923
2021-05-31 07:54:51 +00:00
Robert Greenwalt
23135ce184 [automerger skipped] am d060ac14: (-s ours) Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev am: 625a4a4fb7 -s ours
am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: Iaba72ef9beb8f7635166ed8912a28de08acc7aa2
2021-05-31 07:54:37 +00:00
Robert Greenwalt
29c186fd4c am 02006632: Merge "Call a network restricted only if all capabilities are restricted" into lmp-preview-dev am: 726f87a89e
Original change: undetermined

Change-Id: I805a733221de63b50eb469c84ec2c51bcb6a7ff8
2021-05-31 07:54:26 +00:00
Robert Greenwalt
f1d843cd74 Merge "Report new network scores back to factories." am: 515dc898e4
Original change: undetermined

Change-Id: I7805cf2f5d4abcbdddc86caa0983e994a2864433
2021-05-31 07:54:09 +00:00
Lorenzo Colitti
49d0dc4423 am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev am: 97618013db
Original change: undetermined

Change-Id: Ia3b701dc71cf7330f3005df127970e83b04e4683
2021-05-31 07:44:04 +00:00