Commit graph

2,825 commits

Message SHA1
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685 am: 04720e79b0 am: e0e75de37e am: 264d16941a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: I3d24b5c68ca741ee3f63bf60623ff7882ea9cc50

Mark Chien   authored and   Automerger Merge Worker   commited 2020-08-05 07:35:53 +00:00
e60e4bc62f
Merge "Allow wifi p2p to use legacy dedicated address" am: d2af4d9e2a am: b537c25685 am: 04720e79b0 am: e0e75de37e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382398

Change-Id: Ied938392eedc04e8f96bcb329e78ec6f833db664

Mark Chien   authored and   Automerger Merge Worker   commited 2020-08-05 07:11:15 +00:00
264d16941a
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-08-05 06:54:40 +00:00
e0e75de37e
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-08-05 06:36:36 +00:00
04720e79b0
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-08-05 06:22:38 +00:00
b537c25685
Merge "Allow wifi p2p to use legacy dedicated address"
Mark Chien   authored and   Gerrit Code Review   commited 2020-08-05 06:01:37 +00:00
d2af4d9e2a
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

markchien   commited 2020-08-05 11:03:46 +08:00
eb8fec2111
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595 am: 493f8b7b69 am: 4a4a60da0c am: 6d859d1e2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I55c36bb60ea81f86daa193e9dff738846984e1e7

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-07-31 01:34:46 +00:00
a8f6a339ab
Merge "Move utils from network stack to libs." am: f97ac209c2 am: d96c683595 am: 493f8b7b69 am: 4a4a60da0c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350083

Change-Id: I91978c34aa86b30969fdb90e57c1edd862a53a51

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-07-31 01:28:32 +00:00
6d859d1e2e
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

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-07-31 01:12:13 +00:00
4a4a60da0c
Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70 am: d3a216ae4f am: 230cbcc611 am: 0b192779c3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-07-31 01:10:21 +00:00
309cdb03d2
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

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-07-31 01:09:46 +00:00
493f8b7b69
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

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-07-31 00:53:12 +00:00
d96c683595
Merge "Move utils from network stack to libs."
Chalard Jean   authored and   Gerrit Code Review   commited 2020-07-31 00:44:46 +00:00
f97ac209c2
Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70 am: d3a216ae4f am: 230cbcc611
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618

Change-Id: Ic73d5ae40bfe8e37bbe96b96d6975e305f4c849c

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-07-31 00:24:20 +00:00
0b192779c3
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-07-30 03:38:47 +00:00
230cbcc611
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-07-30 03:17:44 +00:00
d3a216ae4f
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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-07-30 02:59:05 +00:00
d85403cc70
Merge "Update language to comply with Android's inclusive language guidance"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-07-30 02:49:44 +00:00
e66098036f
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

Chalard Jean   commited 2020-07-29 21:15:48 +09:00
bdcca9246e
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-29 05:52:42 +00:00
231c533213
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-29 05:36:59 +00:00
cbbacff29f
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-29 05:21:00 +00:00
9125d2ed58
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-29 04:56:10 +00:00
17cfe5d843
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-29 04:42:10 +00:00
4f671f3834
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

Chiachang Wang   commited 2020-07-29 12:05:04 +08:00
14aaefcb12
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

markchien   commited 2020-07-29 09:55:29 +08:00
af2670f427
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-16 05:27:48 +00:00
ce981df314
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-16 05:10:53 +00:00
beed465ce0
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

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-16 04:58:12 +00:00
38a286c9cd
Merge "Add tethering privileged test" am: af9ec640c9 am: adda81e88f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: Id673131e628856ea57475384160baeac5e10de1b

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-16 04:41:20 +00:00
c882e8c995
Merge "Add tethering privileged test" am: af9ec640c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345361

Change-Id: I9a97578c15ee9122d1e9ef79f42fa059e4fcc7f4

Mark Chien   authored and   Automerger Merge Worker   commited 2020-07-16 04:28:42 +00:00
adda81e88f
Merge "Add tethering privileged test"
Mark Chien   authored and   Gerrit Code Review   commited 2020-07-16 04:12:58 +00:00
af9ec640c9
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

markchien   authored and   Mark Chien   commited 2020-07-16 04:12:01 +00:00
88f0428056
[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

Makoto Onuki   authored and   Automerger Merge Worker   commited 2020-07-15 16:41:02 +00:00
c50c1284d1
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

Makoto Onuki   authored and   Automerger Merge Worker   commited 2020-07-15 16:22:41 +00:00
18f52a7c83
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

Makoto Onuki   authored and   Automerger Merge Worker   commited 2020-07-15 16:15:25 +00:00
df46c500d0
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

Makoto Onuki   authored and   Automerger Merge Worker   commited 2020-07-15 16:00:22 +00:00
aefd8b4e25
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

Makoto Onuki   authored and   Automerger Merge Worker   commited 2020-07-15 15:43:34 +00:00
e39fdf0a5f
Merge "Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs"
Makoto Onuki   authored and   Gerrit Code Review   commited 2020-07-15 15:26:06 +00:00
df5d88796b
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

Makoto Onuki   commited 2020-07-15 01:36:38 +00:00
d682ebc33c
Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs
Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c

Makoto Onuki   commited 2020-07-14 17:46:10 +00:00
7197b67343
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

Automerger Merge Worker   commited 2020-07-13 14:04:34 +00:00
237b4134a7
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 14:04:05 +00:00
52050b38cc
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:55:25 +00:00
c1391ee7c9
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:55:17 +00:00
8db7c04355
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:43:10 +00:00
99c50241f3
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:42:57 +00:00
dd9a53fdf3
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:30:50 +00:00
c72e3873b2
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-07-13 13:30:50 +00:00
31e4bfe7b0