Commit Graph

522 Commits

Author SHA1 Message Date
Bill Yi
2adde431b6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I729ec6ac98a95690838697c28220b11b0f1b0399
2020-09-05 21:39:23 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
13f66a7d24 Merge "Fix tethering jarjar rule for LocalLog" am: 5ac18c5049
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1353287

Change-Id: Ia21b091951f7e5dd3f879d68414653a6c9ff8b25
2020-07-01 09:46:24 +00:00
Mark Chien
5ac18c5049 Merge "Fix tethering jarjar rule for LocalLog" 2020-07-01 09:30:24 +00:00
markchien
a8ac97cf22 Fix tethering jarjar rule for LocalLog
LocalLog is in android.util* instead of android.net*.
No crash happen becaue the methods used by tethering are
@UnsupportedAppUsage.

Bug: 160113128
Test: atest TetheringTests
(cherry-pick from internal branch with conflicts)
Merged-In: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56

Change-Id: I5f070b96f96aaabf7ec8da52a3d3444ed940fb56
2020-06-30 15:30:55 +00:00
Paul Hu
7a87bc4742 Merge "Correct PendingIntent#getActivity() flags" am: 6b2b4e6514
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1329013

Change-Id: I2d1886c4bc2892d3673e87544e3e9c2bb0bb8633
2020-06-29 12:04:06 +00:00
Paul Hu
6b2b4e6514 Merge "Correct PendingIntent#getActivity() flags" 2020-06-29 11:53:18 +00:00
Treehugger Robot
9fba78c098 Merge "Use unstable networkstack AIDLs in development branches" am: cdf6b4202c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444

Change-Id: Ib2a16bd545b98a8d95338f6acce23e265ec5130a
2020-06-29 04:16:40 +00:00
Treehugger Robot
cdf6b4202c Merge "Use unstable networkstack AIDLs in development branches" 2020-06-29 04:02:49 +00:00
paulhu
67aeab2eee Correct PendingIntent#getActivity() flags
TetheringNotificationUpdater create a PendingIntent with
Intent#FLAG_ACTIVITY_NEW_TASK flag. But this flag is used for
Intent only. Thus, move this flag into Intent.

Bug: 158639789
Test: atest TetheringTests
Change-Id: I4c3af75c87b797bcde9356a94c835c7422dac1c6
2020-06-29 00:32:19 +08:00
Orion Hodson
9228c914d2 Merge changes from topic "lnh-platform-split" am: c6b2c39d04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764

Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
1309dcd8de Sync with libnativehelper refactoring am: 0cdccd707f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763

Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71
2020-06-25 07:58:10 +00:00