Chalard Jean
371cab2454
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours am: f1ac1eddad -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b
2020-08-07 07:26:54 +00:00
Chalard Jean
5a3b172d0b
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours am: ce321cccc3 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I853068e1d6301fc99466f255e9084a130d122971
2020-08-07 07:26:47 +00:00
Chalard Jean
f1ac1eddad
[automerger skipped] Merge changes I33b70b0a,I1074eedb am: 8818498877 am: 5ab9ebb883 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58
2020-08-07 07:16:28 +00:00
Chalard Jean
ce321cccc3
[automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd am: 827a8abfb5 -s ours
...
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 2e342b8676 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2
2020-08-07 07:16:23 +00:00
Chalard Jean
5ab9ebb883
Merge changes I33b70b0a,I1074eedb am: 8818498877
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725
Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
2020-08-07 06:59:30 +00:00
Chalard Jean
827a8abfb5
Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: 78701646dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497
Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
2020-08-07 06:59:26 +00:00
Chalard Jean
8818498877
Merge changes I33b70b0a,I1074eedb
...
* changes:
Remove the services.net-module-wifi module target.
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
2020-08-07 06:45:15 +00:00
Chalard Jean
78701646dd
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
...
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.
Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-07 03:31:04 +00:00
Mark Chien
e0e75de37e
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685 am: 04720e79b0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: I209007d8742ac5a331b2b19af164944f38ac36ca
2020-08-05 06:54:40 +00:00
Mark Chien
04720e79b0
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: Ica17499f82135bc96b87ca4071b603bb8cc23053
2020-08-05 06:36:36 +00:00
Mark Chien
b537c25685
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398
Change-Id: I8977ef203c363d68c1c43ecd70f530a4924f01b9
2020-08-05 06:22:38 +00:00
Mark Chien
d2af4d9e2a
Merge "Allow wifi p2p to use legacy dedicated address"
2020-08-05 06:01:37 +00:00
markchien
eb8fec2111
Allow wifi p2p to use legacy dedicated address
...
Some exsting applications may expect wifi p2p use legacy
"192.168.49.1/24" address. Have a configuration for wifi p2p to
decide whether to use legacy dedicated address or random address.
Bug: 161520826
Test: atest TetheringTests
Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
2020-08-05 11:03:46 +08:00
Chalard Jean
4a4a60da0c
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595 am: 493f8b7b69
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I56d148261c5fe94264ff0a68e87020329d06b857
2020-07-31 01:12:13 +00:00
Chalard Jean
493f8b7b69
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: Ia163bc416e16ce56fc96855c1111a9905b712843
2020-07-31 01:09:46 +00:00
Chalard Jean
d96c683595
Merge "Move utils from network stack to libs." am: f97ac209c2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083
Change-Id: I846dae9b7e36ddf6360bb946cc07beb8c44a34a5
2020-07-31 00:53:12 +00:00
Chalard Jean
f97ac209c2
Merge "Move utils from network stack to libs."
2020-07-31 00:44:46 +00:00
Chiachang Wang
230cbcc611
Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70 am: d3a216ae4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: Ib53b46257c7fec87c0da23832776133107f13e5d
2020-07-30 03:38:47 +00:00
Chiachang Wang
d3a216ae4f
Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91
2020-07-30 03:17:44 +00:00
Chiachang Wang
d85403cc70
Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: I5bdb72d5d5d24beb29a96ae605179bd530b4c856
2020-07-30 02:59:05 +00:00
Chiachang Wang
e66098036f
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-30 02:49:44 +00:00
Chalard Jean
bdcca9246e
Move utils from network stack to libs.
...
This package is using some common utilities from
a library that used to live in the network stack.
A better home for these utilities is frameworks/libs,
so this topic moves the files ther and also changes
the package of some utilities.
See aosp/1350222 and aosp/1350182 for a detailed
description of the specific files that moved.
Test: checkbuild
Change-Id: I76a9b7790f3997e3e6b3c2f75ba6308286457cde
2020-07-29 21:15:48 +09:00
Mark Chien
9125d2ed58
Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217
Change-Id: Id45ad3c4bcc90fc3b8355428f8b5d131b220470e
2020-07-29 05:21:00 +00:00
Mark Chien
17cfe5d843
Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217
Change-Id: Ibb1c96fce2435fec3f678d89531ed10a6ddc784f
2020-07-29 04:56:10 +00:00
Mark Chien
4f671f3834
Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217
Change-Id: I6eb68ffd14d3491784d643e0059ca6591de7d8a6
2020-07-29 04:42:10 +00:00
Chiachang Wang
14aaefcb12
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Test: m ; atest TetheringTests
Bug: 161896447
Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
2020-07-29 12:05:04 +08:00
markchien
af2670f427
Always stop dhcp server even it is obsolete
...
If dhcp server is obsolete, explicitly stop it to shut down its thread.
Bug: 161418295
Test: atest CtsTetheringTest
Change-Id: Ic5b876bd23711ec8d832879a7baee0495246b218
2020-07-29 09:55:29 +08:00
Mark Chien
38a286c9cd
Merge "Add tethering privileged test" am: af9ec640c9 am: adda81e88f am: c882e8c995
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361
Change-Id: I46e6a1514c9518ab1f308f129c27d53002793a32
2020-07-16 04:58:12 +00:00
Mark Chien
c882e8c995
Merge "Add tethering privileged test" am: af9ec640c9 am: adda81e88f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361
Change-Id: Id673131e628856ea57475384160baeac5e10de1b
2020-07-16 04:41:20 +00:00
Mark Chien
adda81e88f
Merge "Add tethering privileged test" am: af9ec640c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361
Change-Id: I9a97578c15ee9122d1e9ef79f42fa059e4fcc7f4
2020-07-16 04:28:42 +00:00
Mark Chien
af9ec640c9
Merge "Add tethering privileged test"
2020-07-16 04:12:58 +00:00
markchien
88f0428056
Add tethering privileged test
...
Create TetheringPrivilegedTests which have MAINLINE_NETWORK_STACK
permission, the test can perform various network-related operations
which need CAP_NET_RAW and CAP_NET_ADMIN capabilities.
Bug: 145490751
Test: make TetheringPrivilegedTests
Change-Id: Ic205e5183e066766377c63336d9c5171d4875c6a
2020-07-16 04:12:01 +00:00
Makoto Onuki
df46c500d0
Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b am: e39fdf0a5f am: aefd8b4e25
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884
Change-Id: I3362be72460c8830569b7dda470d581b176ea28a
2020-07-15 16:15:25 +00:00
Makoto Onuki
aefd8b4e25
Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b am: e39fdf0a5f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884
Change-Id: Ie45f32b2d46c8ac989a4a9242017eb4c2b73484b
2020-07-15 16:00:22 +00:00
Makoto Onuki
e39fdf0a5f
Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884
Change-Id: I17d06553e949a9f092bad513ec9880b05d1b38e9
2020-07-15 15:43:34 +00:00
Makoto Onuki
df5d88796b
Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs"
2020-07-15 15:26:06 +00:00
Makoto Onuki
d682ebc33c
Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
...
Test: build / treehugger
Bug: 146727827
Exempt-From-Owner-Approval: Cherry-picking from goog/master to aosp/master
Merged-in: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
2020-07-15 01:36:38 +00:00
Treehugger Robot
99c50241f3
[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours am: c72e3873b2 -s ours
...
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 0275981699 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906
Change-Id: I7295de91e3261861fef8bace9cf3e345197e43ee
2020-07-13 13:43:10 +00:00
Treehugger Robot
dd9a53fdf3
[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 am: 31e4bfe7b0 -s ours
...
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 45fb1aae66 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906
Change-Id: I05505eaaefe7d638a1208e23994c41617ceba60b
2020-07-13 13:42:57 +00:00
Treehugger Robot
c72e3873b2
[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours
...
am skip reason: Change-Id I2b9be6799c6edeefc8cd74897a8704dbe80dd061 with SHA-1 45fb1aae66 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906
Change-Id: I0fd07b73d41f14cd62d208ea7434a5c8f74b7ce3
2020-07-13 13:30:50 +00:00
Treehugger Robot
31e4bfe7b0
Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12137906
Change-Id: I55b776ef0ae16d0a762f10c979e1efb659200ad8
2020-07-13 13:30:50 +00:00
Treehugger Robot
0275981699
Fix EthernetTetheringTest failure if tethering is not supported
...
Do not run ethernet tethering tests if tethering is not supported
because Tethering APIs would fail. Also skip the test if
EthernetManager is not avaliable. EthernetManager would be null if
there are no FEATURE_ETHERNET and FEATURE_USB_HOST.
Bug: 159869957
Test: atest CtsTetheringTest
Merged-In: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
Change-Id: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
2020-07-13 10:01:25 +00:00
Treehugger Robot
8e38519317
Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac am: 8b74fe1c8b am: 218040ca26
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244
Change-Id: I861bc25832f8e3ac436e8f0127aa0aed4f64ca8a
2020-07-13 09:46:27 +00:00
Treehugger Robot
218040ca26
Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac am: 8b74fe1c8b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244
Change-Id: I6763589a3af8cd78efc53e0637ff4f9d6ebcef88
2020-07-13 09:35:07 +00:00
Treehugger Robot
8b74fe1c8b
Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244
Change-Id: I53b28c47dcf5c0590c02fc2f8f7c36a8323030d2
2020-07-13 09:16:57 +00:00
Treehugger Robot
dace79b0ac
Merge "Fix EthernetTetheringTest failure if tethering is not supported"
2020-07-13 09:05:00 +00:00
markchien
45fb1aae66
Fix EthernetTetheringTest failure if tethering is not supported
...
Do not run ethernet tethering tests if tethering is not supported
because Tethering APIs would fail. Also skip the test if
EthernetManager is not avaliable. EthernetManager would be null if
there are no FEATURE_ETHERNET and FEATURE_USB_HOST.
Bug: 159869957
Test: atest CtsTetheringTest
Change-Id: I2b9be6799c6edeefc8cd74897a8704dbe80dd061
2020-07-13 15:24:45 +08:00
Automerger Merge Worker
35e57d4794
Merge "[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours" into rvc-d1-dev-plus-aosp
2020-07-09 00:52:02 +00:00
Mark Chien
6d2eefbcd0
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ideee4189dd6bcb987ccb887d15d2be9f5a3dfb04
2020-07-09 00:51:55 +00:00
Mark Chien
7add55f74c
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -s ours am: 9fe7c99cb1 -s ours
...
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 37ad92e058 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ic947249387fdf90c98d47c1775ea24e8f50286b0
2020-07-09 00:51:54 +00:00