Commit Graph

81 Commits

Author SHA1 Message Date
Mark Chien
0e57c7e589 Merge changes I270ff43c,Ifc7eee24 am: cec294d1b4 am: 82b26e0d1f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1730548

Change-Id: I382f551487f70865761b4dcd0dcdcdb425538f3e
2021-06-21 13:57:31 +00:00
markchien
cab01b7ebc Allow to use ncm function for usb tethering
Adding the configuration to decide using rndis or ncm for usb tethering.
If ncm is configured for TETHEIRNG_USB, then TETHERING_NCM is not
available.

Bug: 162920185
Test: atest TetheringTests
      manul testing usb tethering
Change-Id: Ifc7eee2457a950a0e2d1c3cc89a3373a7ad23c9c
2021-06-18 11:20:26 +08:00
Les Lee
9edd34ee20 Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097 am: 46116ca234
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie54503ed9fc92fbda08316859183c82f1c1846ef
2021-01-18 02:57:22 +00:00
Les Lee
46116ca234 Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25fd5ec86c1c25bcaa4c4bbe5337d8027dff88ad
2021-01-18 02:42:45 +00:00
lesl
6a953ef4d3 wifi: Add bridged pre-fix for tethering interface
In bridged mode, the tethered interface will include the prefix ap_br_

Bug: 162686273
Test: Manual Test - bridged AP enabled success
and client can connected it and get the IP address
Test: atest -c NetworkStackTests
Test: atest -c FrameworksNetTests
Test: atest -c CtsNetTestCasesLatestSdk
Change-Id: I89ae178c658a42f902199afaed89ec798de54643
2021-01-18 01:21:32 +00:00
Bill Yi
479e5b17ef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I34e8bcf3c3f0a5db3522b6ff499ba1583577b250
2020-10-22 23:40:39 -07:00
Xin Li
51ca8f56c5 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Bill Yi
ac8f65a544 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I946ba0e5ca40f934bdc7588eb244969103813c4c
2020-09-03 08:32:04 +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
e60e4bc62f 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
2020-08-05 07:35:53 +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
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
Mark Chien
93743bb990 Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88 am: 5131fee94b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: I2d3971390e897be6669d2f2d4b261eb73875c267
2020-06-23 00:09:17 +00:00
Mark Chien
fdf89ee7fb Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323

Change-Id: Ib48182d51cc6e4586cb43f8ca51ea673ee14d1d7
2020-06-22 23:43:43 +00:00
Dedy Lansky
6896f6193f Tethering: Add WiGig support
This change is a combination of following changes:

1) Tethering: add TETHERING_WIGIG type
   Currently both WIFI and WIGIG use the same tethering type,
   TETHERING_WIFI. This causes conflicts between the frameworks,
   when both WIFI and WIGIG SoftAPs are started, one or both will
   not work.
   Fix this by using a seperate tethering type for WIGIG.

2) Tethering: remove TETHERING_WIGIG state machine on interface down
   The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
   that is sent when the tethering state machine is first created, during
   interface up. Currently the tethering state machine is not removed
   on interface down except for TETHERING_BLUETOOTH, and as a result
   wigig tethering only works the first time SoftAP is started.
   In order to fix this, remove the tethering state machine on interface
   down for TETHERING_WIGIG as well.

Bug: 143356416
Test: TetheringCoverageTests

Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-22 21:17:46 +08:00
Xin Li
d56d89c8a6 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: I5e28537689d1a53e99f91eafd494eb3a0c890f46
Change-Id: I436ef37a509cbe56d02c6d8d3a38c776f4b4883f
2020-06-03 10:45:02 -07:00
Automerger Merge Worker
fd652cafaa Merge "Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456 am: f243a65531" into rvc-d1-dev-plus-aosp am: 89230707cf am: 1ad9df62dd
Change-Id: I4ec5151a20e272153c27fa1b9ee345cf399268fb
2020-05-12 19:37:06 +00:00
Maciej Żenczykowski
f243a65531 Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2 am: 03c8d55456
Change-Id: Ia148434de4f497e2e90b207845ee037a65c98a02
2020-05-12 19:04:39 +00:00
Maciej Żenczykowski
03c8d55456 Merge "A minor followup change for BPF offload device option stuff" am: 88536883e2
Change-Id: Id2f86ebd0668d27eb6002ead9f0a659b26c62c58
2020-05-12 18:52:10 +00:00
Nucca Chen
03f328a76b Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed am: 2cc2f3b424 am: bfa2706282 am: 8756467fb7
Change-Id: I5899298597fd2fce44c4093338ad19df51b15eb1
2020-05-12 12:17:41 +00:00
Nucca Chen
2cc2f3b424 Merge changes I2d6f80f0,I9c26852d am: 50522024a1 am: 6151bb7aed
Change-Id: I52c3ba5b46dc6e52307f68c9201fc19b0a368a09
2020-05-12 11:34:28 +00:00
Nucca Chen
6151bb7aed Merge changes I2d6f80f0,I9c26852d am: 50522024a1
Change-Id: I584138925bf090c1c4b600fc2327220d7e5e39c9
2020-05-12 11:24:05 +00:00
Hungming Chen
5bc3af9a57 A minor followup change for BPF offload device option stuff
- Correct description and spelling in the code and xml files.
- Add a TODO for refactoring the IpServer constructor.
- Refine the if-statement for starting IP neighbor monitor.

Test: atest IpServerTest
Change-Id: If9c8bc6f785fa80575db56de4e223292e9807ace
2020-05-12 19:15:24 +08:00
Hungming Chen
8bf2e7e05b Add tether BPF offload config to device config and resource
The tether bpf offload can be enabled by resource config and
device config. The device config has higher priority and it
could override this config which is set by resource config.

Bug: 149997301
Test: -build, flash, boot
      -atest TetheringConfigurationTest
Change-Id: I9c26852d2c926786e141ece6da53df3801c049b2
2020-05-05 17:37:32 +08:00
Junyu Lai
5ce2a2a7ba Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581 am: f8cd65936d am: 6e1ffdc503 am: f3ba538ef6
Change-Id: I7b4b14cf89fcdb8881ed20f17cdddbdd39d4eca0
2020-05-05 04:10:53 +00:00
Junyu Lai
f8cd65936d Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b am: c44a1ba581
Change-Id: Iceb250d8ba0d31a39538dd59e687ea2d80f4aaba
2020-05-05 03:50:52 +00:00
Junyu Lai
c44a1ba581 Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder" am: 80ab95927b
Change-Id: Ia0f5206e7adc6a8746e68b8ef16e747f11eea97b
2020-05-05 03:30:06 +00:00
Junyu Lai
80ab95927b Merge changes from topic "sp18-TestableNetworkStatsProviderCbBinder"
* changes:
  [SP18.5] Create offload controller poll interval to resource
  [SP18.4] Add unit test for polling network stats in OffloadController
  [SP18.3] Adapt TestableNetworkStatsProviderCbBinder
2020-05-05 03:09:58 +00:00
junyulai
9606a22037 [SP18.5] Create offload controller poll interval to resource
Test: atest TetheringConfigurationTest
Bug: 149467454
Change-Id: I8b4ad920a4945504914d3741a9fba5c096fbf452
2020-05-04 14:56:37 +08:00
Bill Yi
403541e847 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I25406448298353ba63a04099c709ea266851d24f
2020-04-30 22:30:20 -07:00
Bill Yi
3b1e3d04f6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3b69996ab87b3c9ddeeb5c6166a1256b77f30c12
2020-04-30 15:32:29 -07:00
Bill Yi
b78e40bd4f Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I5cb9777f596296af4cbe13a0b1fe57ab2a9283b2
2020-04-28 00:46:32 -07:00
Bill Yi
2b48e19418 Import translations. DO NOT MERGE
Change-Id: I44c343149dc88a88c94327cdd6d5ac26ce7a6816
Auto-generated-cl: translation import
2020-04-22 12:03:48 -07:00
Bill Yi
afb99630b2 Import translations. DO NOT MERGE
BUG:154701280

Change-Id: I835551e4708735d28e0316e6284f69a9eed45cd4
Auto-generated-cl: translation import
2020-04-22 18:04:00 +00:00
Paul Hu
ed2432f4b1 Merge "[TNU08] Remove the "tethering is on" notification" am: 3680357420 am: 6296583f61 am: 2026b5addb am: 9f7b74cf09 am: 15cb89d750
Change-Id: Ied056ed80f8dc6caa72a489a2c75eab40b646dbe
2020-04-22 06:37:51 +00:00
Paul Hu
2026b5addb Merge "[TNU08] Remove the "tethering is on" notification" am: 3680357420 am: 6296583f61
Change-Id: Ie49b39eaf0170ecb74043dfba2cdc5b115a1477d
2020-04-22 06:05:12 +00:00
Paul Hu
6296583f61 Merge "[TNU08] Remove the "tethering is on" notification" am: 3680357420
Change-Id: I74d7c888f450e7f00000f30c63ff5cf05f6a968a
2020-04-22 05:51:36 +00:00
Paul Hu
3680357420 Merge "[TNU08] Remove the "tethering is on" notification" 2020-04-22 05:37:17 +00:00
Paul Hu
19ff1842e2 Merge "[TNU07] Remove unused resources" am: 967bced940 am: 9591b7f9b6 am: eca31b587a am: 55c87aca35 am: b4640d6f18
Change-Id: I46081638e8198287e2db363c29c0fbb9eb83f9de
2020-04-22 04:05:26 +00:00
Paul Hu
eca31b587a Merge "[TNU07] Remove unused resources" am: 967bced940 am: 9591b7f9b6
Change-Id: Ia658f8bdb13f882e7d09f477efdd24f49fc50e68
2020-04-22 03:13:30 +00:00
Paul Hu
9591b7f9b6 Merge "[TNU07] Remove unused resources" am: 967bced940
Change-Id: I5b70685523a21512ee171c8c6285a1a09f207abc
2020-04-22 02:55:07 +00:00
Paul Hu
967bced940 Merge "[TNU07] Remove unused resources" 2020-04-22 02:33:46 +00:00
Bill Yi
8aff1adbe0 Merge "Import translations. DO NOT MERGE" 2020-04-21 18:55:16 +00:00
paulhu
57f26333a8 [TNU08] Remove the "tethering is on" notification
All carriers discarded the requirement to put up a standing
notification when tethering is on. Thus, remove the "tethering
is on" notification.

Bug: 154438388
Test: atest TetheringTests
Change-Id: Ife3915837b6b7b83d3eaaa84b71b6409ff37b71c
2020-04-20 16:10:08 +08:00
paulhu
01a9451cb4 [TNU07] Remove unused resources
Some strings are not used, so just remove them.

Bug: 154445061
Test: atest TetheringTests
Change-Id: Ie67f7f4d0863d58c4c5206e445c1dbdfe3f65f60
2020-04-20 15:52:11 +08:00
Chalard Jean
ffb500bbb2 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13 am: bc380e0215 am: 3e86e96701 am: d865dda2a3
Change-Id: If3f7db58352c0d7097d625e299da4515fcb5ee67
2020-04-17 17:12:44 +00:00
Chalard Jean
bc380e0215 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13
Change-Id: Ia02ca67be0a103e980be6a4c7a0ed66836716d51
2020-04-17 16:28:53 +00:00
paulhu
1f66261a3c [TNU06] Add roaming notification
Warn user of potential data charges if the backhaul is
cellular and user is roaming.

Bug: 145629001
Test: atest TetheringTests
Change-Id: I74b4f87c2f6aad09e05d3f2a779f880396885953
2020-04-17 21:25:54 +08:00
Paul Hu
5a6a06d2e9 Merge "[TNU05] Add no upstream notification" am: b353c7eac3 am: 7cda806393 am: 7c789f41eb am: 0cd85d146a am: e006cd638e
Change-Id: I5eb217f4052a2a354ee74d1f16a8272cb7144762
2020-04-16 02:54:37 +00:00
Paul Hu
7c789f41eb Merge "[TNU05] Add no upstream notification" am: b353c7eac3 am: 7cda806393
Change-Id: Ib65eeed784189e669cc5c22537671deb8d35a9e5
2020-04-16 01:59:03 +00:00