Xin Li
7ff8d101ef
[automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: d4afc0d708 -s ours
...
am skip reason: Merged-In I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53 with SHA-1 3ed5c3997b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15571823
Change-Id: Ie22864e375511188d33632ee66c241422e38af62
2021-08-17 18:35:54 +00:00
Xin Li
945edff9b3
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53
Change-Id: I34ac5913bff3b6a14b373a9596065bc953626567
2021-08-14 06:31:21 +00:00
Ady Abraham
54c496dd18
Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3 am: 416a820c9c am: fcd079ca06
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673
Change-Id: Ica317a4a6b89c16b7807672bcd8efedb8ce251a9
2021-08-12 18:58:36 +00:00
Ady Abraham
fcd079ca06
Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3 am: 416a820c9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673
Change-Id: Ib13a70578ab3e98caa8538600078190ac3814a2a
2021-08-12 18:46:46 +00:00
Ady Abraham
416a820c9c
Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"" am: 089b5546c3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1792673
Change-Id: Id3a13f23c228bf69562e7212c165ca32ead03d36
2021-08-12 18:31:21 +00:00
Ady Abraham
089b5546c3
Merge "Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet""
2021-08-12 18:16:07 +00:00
Ady Abraham
7a4fecc3de
Revert "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"
...
This reverts commit b94c4e7453 .
Reason for revert: b/196387077
Change-Id: I8e27ce915b6069b642c614a018aa5e1788ae07af
2021-08-12 17:16:51 +00:00
Treehugger Robot
9ac3947a68
Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba am: dfca8a970d am: efec1eac58
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326
Change-Id: Ieee33c624b7d59b4adf6488c1fa3a93766afcb5b
2021-08-12 04:08:29 +00:00
Treehugger Robot
efec1eac58
Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba am: dfca8a970d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326
Change-Id: I193c1862b8fa7db9f6db97d813c00dd22f3e80cf
2021-08-12 03:45:35 +00:00
Treehugger Robot
dfca8a970d
Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet" am: f7059e69ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1688326
Change-Id: I0ddd67a41594986fd9029ed61c67d7bd58a40851
2021-08-12 03:26:11 +00:00
Treehugger Robot
f7059e69ba
Merge "Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet"
2021-08-12 03:13:50 +00:00
Patrick Rohr
3ed5c3997b
Remove Unused Code From EthernetNetworkFactory am: 698b59510f am: e7048826ba
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1722876
Change-Id: I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53
2021-07-29 09:27:55 +00:00
Patrick Rohr
e7048826ba
Remove Unused Code From EthernetNetworkFactory am: 698b59510f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1722876
Change-Id: I45330b6646697a7b7655f764bcb8c87b2a1635e7
2021-07-29 09:16:49 +00:00
Milim Lee
b94c4e7453
Set EthernetNetworkSpecifier on each ethernet network for multi-ethernet
...
Bug: 175199512
Test: Build and test multi-ethernet
Change-Id: I6ec50b42bee89520f6f27d40e0d2b0d774b8e2e5
2021-07-29 13:41:18 +09:00
Patrick Rohr
98958bbabf
Add Tests for EthernetNetworkFactory am: e78e8828d6 am: f5e25fcc5d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1486182
Change-Id: Id09046b501b7b280830e51d5b82f2d5e8f7fa6d7
2021-07-28 14:18:22 +00:00
Patrick Rohr
f5e25fcc5d
Add Tests for EthernetNetworkFactory am: e78e8828d6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1486182
Change-Id: If2049d3b4484d68232a9ce1b405aa438c9c673fa
2021-07-28 14:06:11 +00:00
Patrick Rohr
698b59510f
Remove Unused Code From EthernetNetworkFactory
...
Test: atest EthernetNetworkFactoryTest
Change-Id: Ibe0190b3108dca644da2d67bd107954cb26f41ce
2021-07-28 14:22:41 +02:00
Patrick Rohr
e78e8828d6
Add Tests for EthernetNetworkFactory
...
Test: atest EthernetNetworkFactoryTest
Bug: 191635995
Change-Id: I1c07bb6d30706c4e13002eb402fadfecb97b36d1
2021-07-28 14:22:41 +02:00
Lorenzo Colitti
1065fc30b6
[automerger skipped] Stop using LinkPropertiesParcelableUtil. am: 75f629ace7 -s ours
...
am skip reason: Merged-In Iace3ba898bec2940ec3c3323c5bf8a13627d545f with SHA-1 0e077cb1d5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/15044794
Change-Id: Ic9603caae079c1c01201d674e8807f38253f01c5
2021-06-22 05:22:52 +00:00
Lorenzo Colitti
75f629ace7
Stop using LinkPropertiesParcelableUtil.
...
Its methods are all no-ops. Stop using them.
Test: m
Bug: 151052811
Original-Change: https://android-review.googlesource.com/1733473
Merged-In: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-21 10:55:56 +00:00
Lorenzo Colitti
e30816d4ed
Merge "Stop using LinkPropertiesParcelableUtil." am: 0b58e409a1 am: a04fb395b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473
Change-Id: I51829f89466e518712f117675eef40792577ece3
2021-06-21 10:34:48 +00:00
Lorenzo Colitti
a04fb395b6
Merge "Stop using LinkPropertiesParcelableUtil." am: 0b58e409a1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1733473
Change-Id: I723327ade7f1f8134a907e58910812e73ba84968
2021-06-21 10:08:52 +00:00
Lorenzo Colitti
0b58e409a1
Merge "Stop using LinkPropertiesParcelableUtil."
2021-06-21 09:54:29 +00:00
Lorenzo Colitti
0e077cb1d5
Stop using LinkPropertiesParcelableUtil.
...
Its methods are all no-ops. Stop using them.
Test: m
Bug: 151052811
Change-Id: Iace3ba898bec2940ec3c3323c5bf8a13627d545f
2021-06-12 00:42:24 +09:00
Chiachang Wang
f2dd9de6ea
[automerger skipped] Replace clearAll with withoutDefaultCapabilities in NC#Builder am: bbd8b43c93 am: 4bd34bdfba -s ours
...
am skip reason: Merged-In Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6 with SHA-1 6d8141caa1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1708167
Change-Id: I22bd937034d3086ab97cfdc7364d1d2998dc843e
2021-05-17 03:04:50 +00:00
Chiachang Wang
4bd34bdfba
Replace clearAll with withoutDefaultCapabilities in NC#Builder am: bbd8b43c93
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1708167
Change-Id: Ibfd7bab3186ebde177e968ba86962655bee49841
2021-05-17 02:29:35 +00:00
Chiachang Wang
bbd8b43c93
Replace clearAll with withoutDefaultCapabilities in NC#Builder
...
Update the naming and usgae according to API review feedback.
Bug: 184735772
Test: atest EthernetTrackerTest
Change-Id: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
Merged-In: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
2021-05-14 10:36:56 +00:00
Chiachang Wang
f40d0c5a3e
Replace clearAll with withoutDefaultCapabilities in NC#Builder am: 6d8141caa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/14518354
Change-Id: I872a9b2197c21e30f4a6e2aff8d4998f655d61c7
2021-05-14 09:36:56 +00:00
Chiachang Wang
6d8141caa1
Replace clearAll with withoutDefaultCapabilities in NC#Builder
...
Update the naming and usgae according to API review feedback.
Bug: 184735772
Test: atest EthernetTrackerTest
Change-Id: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
2021-05-14 14:24:21 +08:00
lucaslin
80b0c3f84a
[automerger skipped] Add transport type in capabilities filter of EthernetNetworkFacotry am: fe134fbd9c am: c284d8c380 am: 0d93be5f6d -s ours am: 4a4c25f981 -s ours
...
am skip reason: Merged-In Ie64e3cff0ace413f14682736de7a1b65fa93e705 with SHA-1 4450c1542b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1696926
Change-Id: I751b3a92945b5366767c4b265a32db8681d11c75
2021-05-07 09:29:26 +00:00
lucaslin
4a4c25f981
[automerger skipped] Add transport type in capabilities filter of EthernetNetworkFacotry am: fe134fbd9c am: c284d8c380 am: 0d93be5f6d -s ours
...
am skip reason: Merged-In Ie64e3cff0ace413f14682736de7a1b65fa93e705 with SHA-1 4450c1542b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1696926
Change-Id: I0019d3370a710dc9d6f3c64fa4825afc376d0961
2021-05-07 09:16:14 +00:00
lucaslin
0d93be5f6d
Add transport type in capabilities filter of EthernetNetworkFacotry am: fe134fbd9c am: c284d8c380
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1696926
Change-Id: I29ccb5f190bdff21388d85d79c9e5a7967a5fa1f
2021-05-07 08:53:47 +00:00
lucaslin
c284d8c380
Add transport type in capabilities filter of EthernetNetworkFacotry am: fe134fbd9c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1696926
Change-Id: Ib6a6718739976f08797282ed890426e3712693ff
2021-05-07 08:29:54 +00:00
lucaslin
fe134fbd9c
Add transport type in capabilities filter of EthernetNetworkFacotry
...
Bug: 167544279
Test: atest EthernetServiceTests
Change-Id: Ie64e3cff0ace413f14682736de7a1b65fa93e705
Merged-In: Ie64e3cff0ace413f14682736de7a1b65fa93e705
(Cherry-picked from ag/14031548)
2021-05-05 05:11:49 +00:00
paulhu
3056b7418b
Enforce ACCESS_NETWORK_STATE to getAvailableInterfaces()
...
getAvailableInterfaces() will return available ethernet
interfaces which are the information about networks. So it should
enforce ACCESS_NETWORK_STATE permission check to ensure the
applications are allowed to access the information.
Bug: 174573778
Test: TetheringTests
Test: CtsTetheringTest
Change-Id: I7aaa5225d56f2feecc51ba263489ed0ce02fd651
2021-04-26 06:05:39 +00:00
Chiachang Wang
40246d7fb4
Remove hidden connectivity methods usage in ethernet test am: 58e0c49c2e am: 335e3d7e70 am: 0cd0b06061
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1675425
Change-Id: Ibd161192f0c1f681b5442dbf2bee7f60d0dd802b
2021-04-14 18:31:26 +00:00
Chiachang Wang
0cd0b06061
Remove hidden connectivity methods usage in ethernet test am: 58e0c49c2e am: 335e3d7e70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1675425
Change-Id: Ie3bb3078b9a5951044f57365e650b0b637e8acb3
2021-04-14 17:42:40 +00:00
Chiachang Wang
335e3d7e70
Remove hidden connectivity methods usage in ethernet test am: 58e0c49c2e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1675425
Change-Id: I12c4e276c23bf73cd5642f088c029fc1d57ff6e3
2021-04-14 16:54:52 +00:00
Chiachang Wang
58e0c49c2e
Remove hidden connectivity methods usage in ethernet test
...
Bug: 182859030
Test: atest EthernetTrackerTest
Test: 1. remove framework-connectivity.impl from framework bp
2. cd frameworks/opt/net/ethernet/tests ; mm
Change-Id: Ifaeebfca75dc77eec30dd722ddb3166610795b26
2021-04-14 16:31:37 +08:00
lucaslin
4450c1542b
Add transport type in capabilities filter of EthernetNetworkFacotry
...
Bug: 167544279
Test: atest EthernetServiceTests
Change-Id: Ie64e3cff0ace413f14682736de7a1b65fa93e705
2021-03-30 16:54:45 +08:00
lucaslin
c552b93871
[automerger skipped] Use public API instead of hidden API in EthernetTracker am: 19b7b3dfbd am: 4e4a67cf63 am: bdc40776d5 -s ours
...
am skip reason: skip tag Change-Id Idce8bfe7afc31baa644c816afa1f8004987e8c6e with SHA-1 4a0cbe98c1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1649303
Change-Id: I26a620711927d7882ac549b74ce3853ed8f231d5
2021-03-25 10:07:42 +00:00
lucaslin
bdc40776d5
Use public API instead of hidden API in EthernetTracker am: 19b7b3dfbd am: 4e4a67cf63
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1649303
Change-Id: I434cd8b952dabd5aa86b7a4e84af02d23f3543b0
2021-03-25 09:21:56 +00:00
lucaslin
4e4a67cf63
Use public API instead of hidden API in EthernetTracker am: 19b7b3dfbd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1649303
Change-Id: I55ce6d9e45e35629e1b50eed9fb1ea4acb64f564
2021-03-25 08:42:29 +00:00
lucaslin
19b7b3dfbd
Use public API instead of hidden API in EthernetTracker
...
- Use public API of StaticIpConfiguration.Builder to set
ipaddress, domains, gateway and dnsServers.
- Use public constructor to create an instance of IpConfiguration
and set IpAssignment, ProxySettings, StaticIpConfiguration and
HttpProxy by public API.
Bug: 182963415
Test: m ethernet-service
Change-Id: Idce8bfe7afc31baa644c816afa1f8004987e8c6e
Merged-In: Idce8bfe7afc31baa644c816afa1f8004987e8c6e
2021-03-23 09:45:57 +00:00
Lucas Lin
06e1c17103
Merge "Use public API instead of hidden API in EthernetTracker" into sc-dev
2021-03-19 11:23:01 +00:00
junyulai
637b946e7a
Replace reference of NetworkAgent#setLegacyExtraInfo am: c439eae5b4 am: 801dad1d42 am: af4327a474
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645031
Change-Id: If4c386e11f2cafda1c9052e7bd9f395213f23ddd
2021-03-19 09:44:52 +00:00
junyulai
ac7394f376
Replace references of request.networkCapabilies am: 89764da132 am: a340a23572 am: 9e44a65406
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645030
Change-Id: I3adb0e07f10c4a94c9517b7ba342bbfc7b6e7867
2021-03-19 09:44:07 +00:00
junyulai
af4327a474
Replace reference of NetworkAgent#setLegacyExtraInfo am: c439eae5b4 am: 801dad1d42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645031
Change-Id: Ibd0ecccb3fc9a409be521253bdf15220515a5c29
2021-03-19 09:02:53 +00:00
junyulai
9e44a65406
Replace references of request.networkCapabilies am: 89764da132 am: a340a23572
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645030
Change-Id: I47e3f92c03b2befe97af721a36a3908b55d7cadc
2021-03-19 09:02:40 +00:00
junyulai
801dad1d42
Replace reference of NetworkAgent#setLegacyExtraInfo am: c439eae5b4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1645031
Change-Id: Ie9fb99ada7c78db35a066d5a01d69c0dcadcc232
2021-03-19 08:37:11 +00:00