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
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
Mark Chien
9fe7c99cb1
[automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 -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: Id285ac8febcc062375bda7c95ba824dc9dd4d3bf
2020-07-09 00:39:33 +00:00
Mark Chien
ea316b9be6
Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761
Change-Id: Ib429b7ed5fddd2d1a766b8b2b7e57c191ce59559
2020-07-09 00:39:31 +00:00
Treehugger Robot
6faf861994
Skip testPhysicalEthernet if the test run adb over network
...
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.
Bug: 160389275
Test: atest CtsTetheringTest
Merged-In: I57d365d33316881c50c3bf7fd1c98926d10842d3
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
2020-07-08 05:40:52 +00:00
Treehugger Robot
bdb720dbc3
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I3b2027ad8685e9a5ebb7b06da412ab5a3f42ed2b
2020-07-08 05:16:10 +00:00
Treehugger Robot
c8f45d6350
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I5e91a05d90f5f05cdbe7e7b30945d80832759bd2
2020-07-08 05:06:20 +00:00
Treehugger Robot
10daa1daae
Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445
Change-Id: I0d6eb8195743a6318c5adabb26d837ae35236c0d
2020-07-08 04:54:34 +00:00
Treehugger Robot
b68d322521
Merge "Skip testPhysicalEthernet if the test run adb over network"
2020-07-08 04:41:34 +00:00
Treehugger Robot
324a662a89
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -s ours am: 57a3f6e0af -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/+/1354443
Change-Id: I8f5a2c331176a3e1a2c11aebe65a6a8799f309a2
2020-07-03 01:53:51 +00:00
Treehugger Robot
57a3f6e0af
[automerger skipped] Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887 am: 0052646bd6 -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/+/1354443
Change-Id: Ie3cef51a714de2c9111554c84a5e7aba49a4818f
2020-07-03 01:36:29 +00:00
Treehugger Robot
0052646bd6
Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354443
Change-Id: I472fd717d82304e4362c3075805b460b02a197e0
2020-07-03 00:54:07 +00:00
Chalard Jean
6b66d70ba1
Revert "Move Inet[4]AddressUtils to libs/net"
...
This reverts commit cf86031c12 .
Reason for revert: Breaks the build b/160390899
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Change-Id: Ie10e66f61393602f17fbb61bf17230b176bf1f44
2020-07-02 23:47:35 +00:00
markchien
37ad92e058
Skip testPhysicalEthernet if the test run adb over network
...
If the test run adb over network and ethernet is available, it is likely
that adb may run over ethernet. Then the test would fail because adb
would break when ethernet is switching from client mode to server mode.
Bug: 160389275
Test: atest CtsTetheringTest
Change-Id: I57d365d33316881c50c3bf7fd1c98926d10842d3
2020-07-02 23:26:46 +08:00
Remi NGUYEN VAN
68e2fd8b73
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours am: 4db7ca359f -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iad6a186fda02f69741ef0a2403e16973300bae1e
2020-07-02 09:52:45 +00:00
Remi NGUYEN VAN
4db7ca359f
[automerger skipped] Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167 am: e4116cf383 -s ours
...
am skip reason: Change-Id I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f with SHA-1 e10b80de7d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: Iae9c8eb2e17130737e4cd30b03c4d20afbae6dc8
2020-07-02 09:39:11 +00:00
Remi NGUYEN VAN
e4116cf383
Merge "Move Inet[4]AddressUtils to libs/net" am: 5bc91ca167
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1324109
Change-Id: I51d32e4efd0d9fc458b02022b6308920f7c812a9
2020-07-02 09:21:23 +00:00
Remi NGUYEN VAN
cf86031c12
Move Inet[4]AddressUtils to libs/net
...
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.
Also refine comments in DhcpResults following feedback in previous
change.
(cherry-pick from internal branch skipping wifi classes; no other
conflict)
Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Merged-In: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
Change-Id: I7074651c6a2a7a6b11bcf13cc4bb03833d7d655f
2020-07-02 10:52:31 +09:00
Mark Chien
4fe609fa48
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours am: 203c4f1978 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I746c6a4282f3ff0d32bf6db654bc3b75cfb14669
2020-07-01 10:11:30 +00:00
Mark Chien
203c4f1978
[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049 am: 13f66a7d24 -s ours
...
am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 683932315b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287
Change-Id: I8940d70a097ca954ceec622ba42663a7fbf11c9c
2020-07-01 09:59:28 +00:00