Commit Graph

2804 Commits

Author SHA1 Message Date
Mark Chien
231c533213 Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843 am: 9125d2ed58 am: cbbacff29f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: I1ef0d35da436cc283ddc57daf5d8ec29f11db999
2020-07-29 05:52:42 +00:00
Mark Chien
cbbacff29f Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: 4f671f3834 am: 17cfe5d843 am: 9125d2ed58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: I434a17c5f41aed0b7f40cc5d23f6c6c0999d3fa5
2020-07-29 05:36:59 +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
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
ce981df314 Merge "Add tethering privileged test" am: af9ec640c9 am: adda81e88f am: c882e8c995 am: 38a286c9cd am: beed465ce0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: Ibf452f7cc59bfa220d55878ea57e6486f4c4b17c
2020-07-16 05:27:48 +00:00
Mark Chien
beed465ce0 Merge "Add tethering privileged test" am: af9ec640c9 am: adda81e88f am: c882e8c995 am: 38a286c9cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: Ie48b6709a5a962eac8c967912596d517040b80de
2020-07-16 05:10:53 +00: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
c50c1284d1 [automerger skipped] Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b am: e39fdf0a5f am: aefd8b4e25 am: df46c500d0 am: 18f52a7c83 -s ours
am skip reason: Change-Id Ie1ad6711c490c679ebcfacd97154380a8810ba1c with SHA-1 7197b67343 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: Ieac74d78d7e6ada488f4051612b0fd00e9f7dda9
2020-07-15 16:41:02 +00:00
Makoto Onuki
18f52a7c83 Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs" am: df5d88796b am: e39fdf0a5f am: aefd8b4e25 am: df46c500d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1360884

Change-Id: Ifb1b9b7aeb1ec6e5e11b4c60be477d7154915b61
2020-07-15 16:22:41 +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
Makoto Onuki
7197b67343 Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c
2020-07-14 17:46:10 +00:00
Automerger Merge Worker
237b4134a7 Merge "[automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours am: c72e3873b2 -s ours am: 99c50241f3 -s ours" into rvc-qpr-dev-plus-aosp am: f8df6534c9 -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: Iecfde7015fb67a4066697e95b80d70c71a09d177
2020-07-13 14:04:34 +00:00
Treehugger Robot
52050b38cc [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 am: 31e4bfe7b0 -s ours am: dd9a53fdf3 -s ours am: 8db7c04355 -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: I102bc3494fb7c1f51d6be89610fbbf196a3a3445
2020-07-13 14:04:05 +00:00
Treehugger Robot
c1391ee7c9 [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 -s ours am: c72e3873b2 -s ours am: 99c50241f3 -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: I7cda80e26c95d0816e842dc973fcfc35b03c9a71
2020-07-13 13:55:25 +00:00
Treehugger Robot
8db7c04355 [automerger skipped] Fix EthernetTetheringTest failure if tethering is not supported am: 0275981699 am: 31e4bfe7b0 -s ours am: dd9a53fdf3 -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: I496218db0523df329096273cefde393b54e262ae
2020-07-13 13:55:17 +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
a2d4032eee Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac am: 8b74fe1c8b am: 218040ca26 am: 8e38519317 am: 5025a9359e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244

Change-Id: Ibb26230ad003c82134f586435f135e862de6dd74
2020-07-13 10:04:53 +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
5025a9359e Merge "Fix EthernetTetheringTest failure if tethering is not supported" am: dace79b0ac am: 8b74fe1c8b am: 218040ca26 am: 8e38519317
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1352244

Change-Id: I3ffd9429d36ee79f73a39ffbd86e43b46d0f2a8a
2020-07-13 09:55:35 +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
d9a593bdce 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 am: 35e57d4794 -s ours am: b0d95f1bcd -s ours
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 6faf861994 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761

Change-Id: I68960698fe47f926ff730a3a909b34a03abf45f4
2020-07-09 01:12:33 +00:00
Mark Chien
448d9073fe [automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours am: 6d2eefbcd0 -s ours am: 479f815664 -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: Ie1f377c3446dda488d1301b55ff0251496d54056
2020-07-09 01:12:23 +00:00
Automerger Merge Worker
b0d95f1bcd 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 am: 35e57d4794 -s ours
am skip reason: Change-Id I57d365d33316881c50c3bf7fd1c98926d10842d3 with SHA-1 6faf861994 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12105761

Change-Id: I6d5340d966b851683223fc38049c9bdcfa60d3e1
2020-07-09 01:01:23 +00:00
Mark Chien
479f815664 [automerger skipped] Merge "Skip testPhysicalEthernet if the test run adb over network" into rvc-dev am: a973bf1a56 am: ea316b9be6 -s ours am: 6d2eefbcd0 -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: I1af4570848b8271f13f291cbedbfc3c89ed74ec1
2020-07-09 01:00:58 +00: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
e8d41a3526 Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350 am: bdb720dbc3 am: f5afab18f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: Ia80b411c3f5eac3f1154a02d88ef1b7fcea1a55a
2020-07-08 05:40:23 +00:00
Treehugger Robot
f5afab18f7 Merge "Skip testPhysicalEthernet if the test run adb over network" am: b68d322521 am: 10daa1daae am: c8f45d6350 am: bdb720dbc3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354445

Change-Id: I81aa71a22ad812d617b69733d7a7c12925496878
2020-07-08 05:29:53 +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