Lorenzo Colitti
dad733aa47
Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d am: dd43e05b6e am: 9910abce5f am: c9f555589d
...
Change-Id: Icf64d871d6ea87bbab6a3fd3b9a1732bc423832f
2020-04-14 10:08:05 +00:00
Paul Hu
5bc47bf309
Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de am: caf808e0eb am: 3793a8eece am: ac1ddcf34a
...
Change-Id: I1d6aedfb2008a4af9a1cb7eb392050774204fcae
2020-04-14 10:07:54 +00:00
Lorenzo Colitti
dd43e05b6e
Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91 am: 81dd21611d
...
Change-Id: Ie7060e6408acd73f1a5d2456d030a1958df32847
2020-04-14 09:21:19 +00:00
Paul Hu
caf808e0eb
Merge "Update tethering notification strings" am: 6f6527e2d7 am: 26b3b4e0de
...
Change-Id: If9d8e5945160b6def527e7f3ee372dfe533140e9
2020-04-14 09:20:54 +00:00
Lorenzo Colitti
941a53ce91
Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED."
2020-04-14 08:22:30 +00:00
Paul Hu
6f6527e2d7
Merge "Update tethering notification strings"
2020-04-14 07:15:16 +00:00
Lorenzo Colitti
330a9b9fa7
Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED.
...
These events don't have MAC addresses, so the code attempts to
create an Ipv6ForwardingRule with a null MAC address. This
crashes when attempting to get the raw MAC address bytes to send
to netd in the TetherOffloadRuleParcel.
This was not caught by unit tests because the test exercise this
code path in a way that is not correct (by sending RTM_DELNEIGH
and NUD_FAILED events with MAC addresses). Fix the unit tests to
properly pass in null MAC addresses for these events.
Bug: 153697068
Test: fixed existing tests to be more realistic
Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
2020-04-14 15:02:17 +09:00
markchien
d995566700
Change tethering file structure to respect its package name
...
Bug: 145099347
Test: atest TetheringTests
atest CtsTetheringTest
Change-Id: I7401c550fbafd17a5ed2d925b5d0e17e358af467
2020-04-14 02:09:51 +00:00
Ashwini Oruganti
910a0b44dd
Tethering: Add an exported flag in manifest
...
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.
Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit dc03d15189 )
2020-04-14 00:08:24 +08:00
Ashwini Oruganti
af37b0a723
Tethering: Add an exported flag in manifest
...
With b/150232615, we will need an explicit value set for the exported
flag when intent filters are present, as the default behavior is
changing for S+. This change adds the value reflecting the previous
default to the manifest.
Bug: 150232615
Test: TH
Change-Id: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
Merged-In: I25b55378df393cd4fb8932b7ae64f97eb9f1aa8e
(cherry picked from commit 9226d6c835cd57d10a7562f18143dbaae8601b43)
2020-04-13 15:15:28 +00:00
paulhu
735047bf6e
Update tethering notification strings
...
Update strings after converged with carrier.
Bug: 145629001
Bug: 147818698
Test: atests TetheringTests
Change-Id: I8ad34e8c93ba1547aa397a8e9c0ecc15286a2b0b
2020-04-13 13:36:52 +00:00
Treehugger Robot
5da1070d8f
Assign specific client address to dhcp server
...
Bug: 141256482
Test: manual
atest TetheringTests
Merged-In: Ief76c98c843ba5420224cbf0f34464f366c891b7
Change-Id: Ief76c98c843ba5420224cbf0f34464f366c891b7
2020-04-10 10:03:20 +00:00
TreeHugger Robot
2be7b9faac
Merge "Import translations. DO NOT MERGE"
2020-04-10 06:05:53 +00:00
Luke Huang
d20078112b
Use the lastest frozen netd_aidl_interface in framework
...
Bug: 140541991
Test: build
Merged-In: I984969e09f8d5196945a7412c51bd8880223ad9e
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-09 16:20:44 +00:00
Bill Yi
f3d18d43fc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5fad2cb9cbe12cf0eb1d046317d420667a262b8e
2020-04-08 23:37:10 -07:00
Paul Hu
fab349c0a9
Address aosp/1274403 leftover comment
...
Bug: 152828142
Test: atest EntitlementManagerTest
Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
Merged-In: I81f2d268c9f26bc4488b06032477a73d071f73f8
(cherry picked from commit 9fe0a868e909a4cd1c1c63bf981441f1b9128890)
2020-04-09 02:13:32 +00:00
Paul Hu
bb1f4a6f2b
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911 am: 77908d971d am: 7e8f78291c am: aa4e34d823
...
Change-Id: I07dd1b7ef7f52c57a7d5020e4d274950923a50fb
2020-04-08 08:51:23 +00:00
Automerger Merge Worker
b33911c19c
Fix TetheringIntegrationTests failure
...
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
Merged-In: I5a537eca9b1aab3694a11a2dab147a31f289314c
(cherry picked from commit f626b8a5388746d163600a5eccb60e22cb1071bf)
2020-04-08 08:17:20 +00:00
Paul Hu
77908d971d
Merge "Address aosp/1274403 leftover comment" am: 9f33a5a7d9 am: 3d363f0911
...
Change-Id: I420e4c0f9ae9f95dec822257c5dabf10f9b79201
2020-04-08 07:57:59 +00:00
Paul Hu
9f33a5a7d9
Merge "Address aosp/1274403 leftover comment"
2020-04-08 07:36:35 +00:00
Automerger Merge Worker
2a07469306
Merge "Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb am: c05defa458" into rvc-d1-dev-plus-aosp am: dc64ce7c0d am: e271f0784f
...
Change-Id: I4ef0b8c08c7fb621c11378846ab934d854c3fb18
2020-04-08 07:13:44 +00:00
Paul Hu
c05defa458
Merge "Fix TetheringIntegrationTests failure" am: 77f43e56ef am: 525df29ccb
...
Change-Id: Icde8ef078ec5ebde8d9c978432a9aa12b7a1e3a9
2020-04-08 06:40:20 +00:00
Paul Hu
77f43e56ef
Merge "Fix TetheringIntegrationTests failure"
2020-04-08 06:12:29 +00:00
paulhu
eaa2b0e30a
Address aosp/1274403 leftover comment
...
Bug: 152828142
Test: atest EntitlementManagerTest
Change-Id: I81f2d268c9f26bc4488b06032477a73d071f73f8
2020-04-08 11:45:08 +08:00
paulhu
d584d2fa36
Fix TetheringIntegrationTests failure
...
Bug: 150644681
Test: atest TetheringIntegrationTests
Change-Id: I5a537eca9b1aab3694a11a2dab147a31f289314c
2020-04-08 09:57:57 +08:00
Mark Chien
47c8b0f87e
Add TetheringServiceTest unitest
...
Bug: 145490751
Test: atest TetheringTests
Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
Merged-In: I68cd403302848c041444e6d47652435d67f59273
(cherry picked from commit 790a4dd7d3aa813f15fe95c5bf3cef6dd734ce32)
2020-04-08 01:02:39 +00:00
Mark Chien
fbe8a3d909
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9 am: 6ca4626803 am: 0a90c3b9b4 am: 1a69dade06
...
Change-Id: Ia9e3232467c7db0e566cced84f3c72bbcd6512d6
2020-04-07 16:17:49 +00:00
Luke Huang
02ab8737d0
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9 am: 8518b55a0f am: 0a578f04e7 am: 906b906af6
...
Change-Id: If70288416cd1d6ec7a0d344ac7ab619fd290e2fc
2020-04-07 16:15:21 +00:00
Mark Chien
6ca4626803
Merge "Add TetheringServiceTest unitest" am: 7e0920903b am: 7f8095b2d9
...
Change-Id: Ib34e3b601e8f2bbb96c2a706d614696500cc18fc
2020-04-07 16:05:50 +00:00
Luke Huang
8518b55a0f
Merge "Use the lastest frozen netd_aidl_interface in framework" am: 04bee1894a am: f49e7dfca9
...
Change-Id: Ie89032a792aa05c50530dcf4e67b96d0717c992c
2020-04-07 15:45:02 +00:00
Mark Chien
7e0920903b
Merge "Add TetheringServiceTest unitest"
2020-04-07 15:39:38 +00:00
Luke Huang
6ca4ec97d2
Use the lastest frozen netd_aidl_interface in framework
...
Bug: 140541991
Test: build
Change-Id: I984969e09f8d5196945a7412c51bd8880223ad9e
2020-04-07 08:35:42 +00:00
Mark Chien
8caf921dc8
Merge "Add IPv6TetheringCoordinator unit test" into rvc-dev
2020-04-07 07:50:40 +00:00
Paul Hu
aaf92e5165
Merge "Fix EntitlementManager issues" into rvc-dev
2020-04-07 04:37:30 +00:00
Mark Chien
5e9e0337c5
Add IPv6TetheringCoordinator unit test
...
Bug: 148636687
Test: atest IPv6TetheringCoordinatorTest
Change-Id: I1ba30bb524cbc0cc2782ce1702f9889c0d8a7576
Merged-In: I939323ce09adb9c66b1e2b83d58b0f892aa8f011
(cherry picked from commit 368c56dd7133d292c5f3ab5942016bb4dd1fbc88)
2020-04-07 04:33:24 +00:00
Lorenzo Colitti
6343b0c968
Merge "Add a test for static IPv4 address tethering configuration." into rvc-dev
2020-04-07 04:30:58 +00:00
Lorenzo Colitti
303e9bdddf
Merge "Use CompletableFuture instead of a latch." into rvc-dev
2020-04-07 04:30:33 +00:00
Xiao Ma
210adac5fa
Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." into rvc-dev
2020-04-07 02:50:41 +00:00
Lorenzo Colitti
7f6ab40294
Add a test for static IPv4 address tethering configuration.
...
Bug: 150644681
Test: test-only change
Merged-In: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
Change-Id: I8f4a99da2351fdb5467f561a9732b14a8ebf674b
2020-04-07 02:21:00 +00:00
Lorenzo Colitti
46b44053da
Use CompletableFuture instead of a latch.
...
Addresses review comments on aosp/1260100.
Bug: 150644681
Test: test-only change
Merged-In: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
Change-Id: Ia73ba8a121a3744a5e36795d2d2bff2f099c1394
2020-04-07 02:20:35 +00:00
Xiao Ma
06c8ba0cd7
Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic.
...
Bug: 130741856
Test: atest TetheringTests
Merged-In: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
Change-Id: I66614fbf67fba1e7dab0b8a2d41bc30a726e4f38
2020-04-07 01:26:50 +00:00
Paul Hu
bd8d7a8208
Fix EntitlementManager issues
...
1. Add TETHERING_ETHERNET to vaild downstream type. So starting
ethernet tethering will do entitlement check as well.
2. Ignore request with invalid downstream type on
handleRequestLatestTetheringEntitlementValue()
Bug: 152828758
Bug: 152828142
Test: atests TetheringTests CtsTetheringTest
Change-Id: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
Merged-In: Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8
(cherry picked from commit c502e050fd9543e8bde45014dd66ea1be91c90ef)
2020-04-07 01:23:49 +00:00
Mark Chien
ee06f2a4fc
Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8 am: 258d28303e am: cee4c931b1 am: 968baf0e2c
...
Change-Id: I1ba30bb524cbc0cc2782ce1702f9889c0d8a7576
2020-04-06 16:59:51 +00:00
Mark Chien
258d28303e
Merge "Add IPv6TetheringCoordinator unit test" am: 7b4fb08444 am: 173e69b2a8
...
Change-Id: I5b38a893522fcea37f757c7d7234d07e3176fe1b
2020-04-06 15:59:56 +00:00
Lorenzo Colitti
e6107d2466
Migrate to TetherOffloadRuleParcel in IpServer
...
The netd tethering offload IPCs are changing from taking a list
of primitives to taking a TetherOffloadRuleParcel. Modify their
only caller.
Bug: 140541991
Test: atest IpServerTest
Merged-In: I83718c80ef9d31199c87021b4dd5821717fd5ba5
Change-Id: I83718c80ef9d31199c87021b4dd5821717fd5ba5
2020-04-06 15:45:58 +00:00
Xiao Ma
4b5930b22e
Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be am: 9558865f76 am: e1c2e2b354 am: 84b5603330
...
Change-Id: I6d837dd44f89913b5e6e5a4d394d38b5478220f8
2020-04-06 15:44:48 +00:00
Lorenzo Colitti
387241de01
Merge "Migrate to TetherOffloadRuleParcel in IpServer" am: b22a70d7c8 am: 2aea86b521 am: dc25174ebe am: 661f191c3b am: bb1ae69738
...
Change-Id: Id55be8ade5abc761fb14d40f7b39e2b047e86260
2020-04-06 15:41:30 +00:00
Mark Chien
7b4fb08444
Merge "Add IPv6TetheringCoordinator unit test"
2020-04-06 15:25:37 +00:00
Xiao Ma
9558865f76
Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic." am: a73e5c5c18 am: d0b65f11be
...
Change-Id: Ib5be6794077c5e932fdf4bfc93fab822e6cb70d7
2020-04-06 11:24:48 +00:00
Xiao Ma
a73e5c5c18
Merge "Rename IDhcpLeaseCallbacks to IDhcpEventCallbacks for more generic."
2020-04-06 10:43:28 +00:00