Commit Graph

1733 Commits

Author SHA1 Message Date
Xin Li
5484d174a4 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: eea8d0591b -s ours
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

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

Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a
2020-09-01 21:46:39 +00:00
Xin Li
eea8d0591b [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

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

Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d
2020-09-01 20:37:03 +00:00
Xin Li
82a71b8f72 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Mark Chien
94724bacec Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716 am: 36fd800cb1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: I7a70a8ea8cfe430755544b0b57660658477e7416
2020-08-18 09:43:15 +00:00
Mark Chien
36fd800cb1 Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a am: 1ed9e74716
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: If1ea472e2b7e715ab97851394dc8980ad269b7a1
2020-08-18 09:28:57 +00:00
Mark Chien
1ed9e74716 Merge "Add usesCleartextTraffic to Tethering" am: 3aee2ac91a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402629

Change-Id: Ia5d7695edf13ac4ae9544c648fa95068809f0ab1
2020-08-18 09:19:56 +00:00
Mark Chien
3aee2ac91a Merge "Add usesCleartextTraffic to Tethering" 2020-08-18 09:04:59 +00:00
markchien
c12b03a935 Add usesCleartextTraffic to Tethering
usesCleartextTraffic needs to be true for the networkstack process so
that the NetworkStack module can use no-encrypted probes to detect
captive portals.

When loaded in the networkstack process, all packages in process must
set usesCleartextTraffic=true, otherwise there may be races causing
the flag not to be set for the process.

Bug: 161860610
Test: CtsTetheringTest, TetheringTests
Change-Id: Ife03ee0c7096ea242eb701b297a69b471e15b436
2020-08-18 09:00:58 +00:00
Chalard Jean
8c4ebe4067 Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694 am: 09fdd9236d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad
2020-08-13 04:43:45 +00:00
Chalard Jean
09fdd9236d Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4 am: c5d748e694
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
2020-08-13 04:26:11 +00:00
Chalard Jean
c5d748e694 Merge "Rename Kotlin util files to not include the Kt suffix" am: b1a3247ab4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509
2020-08-13 04:09:27 +00:00
Chalard Jean
96924bf201 Rename Kotlin util files to not include the Kt suffix
Callers don't care what language the utilities are written in

Test: builds
Change-Id: Ie212144f36c50db223c05f3fcb6bad745842cb5e
2020-08-12 10:02:50 +09:00
Paul Hu
90ffbeea18 Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767 am: 0ee374a02c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: I885046eb25c6dafbcb4284fd94bff0052f7bdd09
2020-08-10 02:27:25 +00:00
Paul Hu
0ee374a02c Merge "Verify pending intent flags" am: 346a361e93 am: 9caa751767
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: Id37713388c0c2245e708ca1ca81e78d288168dfd
2020-08-10 02:04:40 +00:00
Paul Hu
9caa751767 Merge "Verify pending intent flags" am: 346a361e93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: I6764ac9bface86d26f395c6a4fd8b63f7a08df6e
2020-08-10 01:46:50 +00:00
Paul Hu
346a361e93 Merge "Verify pending intent flags" 2020-08-10 01:32:12 +00:00
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
paulhu
f603ed5fb8 Verify pending intent flags
All PendingIntent included activity and broadcast should set
FLAG_IMMUTABLE flag.

Bug: 156353008
Test: atest TetheringTests
Change-Id: I4592e914b67ecb8865d7de47797423f27e9ff840
2020-08-04 11:24:33 +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