Commit Graph

525 Commits

Author SHA1 Message Date
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
6aec9e6199 Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac am: a91e5e5da6 am: eef15b96ac am: 5a0d178f04 am: 4ba6b37650
Change-Id: I4da700556ade571ab9d96c78b3966d64bdd44328
2020-04-16 09:39:28 +00:00
Paul Hu
eef15b96ac Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac am: a91e5e5da6
Change-Id: I56a0ce98beed6797486e26a5148ee3685a3ae0ef
2020-04-16 09:04:57 +00:00
Paul Hu
14fb7f6fac Merge "[TNU05.1] Address aosp/1237036 leftover comments" 2020-04-16 08:25:24 +00:00
paulhu
1317e27e91 [TNU05.1] Address aosp/1237036 leftover comments
Bug: 147818698
Test: atest TetheringTests
Change-Id: Ife738339aeae00d2063fea6918b50204daef24fc
2020-04-16 14:39:12 +08:00
Paul Hu
baf4513d45 Merge "Add TetheringCoverageTests" 2020-04-16 06:00:07 +00:00
Mark Chien
d52c449d2b Merge "Remove sendMessage inside EntitlementManager" am: b4624df935 am: 2acc78a6a9 am: d8a80a418d am: b01d54e654 am: bf09eaeb3c
Change-Id: Ib76df5fb33c91ad7644cc6c3c9006a13816b5594
2020-04-16 03:27:10 +00: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
Mark Chien
d8a80a418d Merge "Remove sendMessage inside EntitlementManager" am: b4624df935 am: 2acc78a6a9
Change-Id: Ia582129af14366051e81f3d5b77cb018f453a2ee
2020-04-16 02:47:22 +00:00
Mark Chien
b4624df935 Merge "Remove sendMessage inside EntitlementManager" 2020-04-16 02:07:55 +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
Paul Hu
b353c7eac3 Merge "[TNU05] Add no upstream notification" 2020-04-16 01:31:06 +00:00
Mark Chien
e22cecd53a Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e35198d am: 7018843a2e am: b90f7a5c5c am: cc3b129109 am: f56154f898
Change-Id: I2dcc6ccb6abbd51b40e407d83a104de64c498528
2020-04-16 00:22:58 +00:00
Amit Mahajan
69f3fa3729 DO NOT MERGE Remove references of telephony-stubs.
Since it's not used for now.

Test: TH
Bug: 153304048
Change-Id: I1812818c3d49463c3840a98212bbab58a110359a
2020-04-15 14:38:58 -07:00
Mark Chien
b90f7a5c5c Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e35198d am: 7018843a2e
Change-Id: Ia0e60d2e72e2fe94ea14e30cb80a4c24e9b7b75c
2020-04-15 17:28:27 +00:00
Paul Hu
39bca3fc04 Merge "Add TetheringCoverageTests" into rvc-dev am: 82a29a3308 am: 1c1c17c09d am: d884248f30 am: e82b0547f6
Change-Id: I4a1586bdad173c7247f871ebd5c515f9ea508283
2020-04-15 16:51:42 +00:00
markchien
a1a0be93f0 Remove sendMessage inside EntitlementManager
EntitlementManager and its callers(Tethering and UpstreamNetworkMonitor)
run in the same threads.

Bug: 141256482
Test: atest TetheringTests
Change-Id: I0a376d28b123eaab2e8d00a98a4719ce983d3bb2
2020-04-15 02:29:21 +00:00
paulhu
64632657a2 Add TetheringCoverageTests
Bug: 148636687
Test: atest TetheringCoverageTests
      atest TetheringTests
      atest TetheringIntegrationTests
      atest NetworkStackTests
      atest CtsTetheringTest
Change-Id: I1f2a50f16894b05e988476520ba25baba0b60d88
Merged-In: I1f2a50f16894b05e988476520ba25baba0b60d88
2020-04-15 00:50:01 +00:00
paulhu
648fc2c8ea [TNU05] Add no upstream notification
Reminder user of unavailable tethering status if there is no
internet access.

Bug: 147818698
Test: atest TetheringTests
Change-Id: Ic6557f9f7703337596100cd6a477fd7239217166
2020-04-15 01:25:37 +08:00
Mark Chien
df27b80604 Merge "Change tethering file structure to respect its package name" into rvc-dev-plus-aosp am: 48b8904ac4 am: 484347b58b am: 987a082559
Change-Id: I501bfac94039335b848a836ed40d87be4107ad5b
2020-04-14 15:10:26 +00:00
paulhu
d1ebb1e348 Add TetheringCoverageTests
Bug: 148636687
Test: atest TetheringCoverageTests
      atest TetheringTests
      atest TetheringIntegrationTests
      atest NetworkStackTests
      atest CtsTetheringTest
Change-Id: I1f2a50f16894b05e988476520ba25baba0b60d88
2020-04-14 14:14:33 +00:00
Paul Hu
13113c4502 Merge "Update tethering notification strings" into rvc-dev 2020-04-14 14:07:19 +00:00
markchien
1acfb0125c Change tethering file structure to respect its package name
Bug: 145099347
Test: atest TetheringTests
      atest CtsTetheringTest
Change-Id: I544ab9480bbaa5e18e030d21a28ab4c4a7265795
2020-04-14 12:25:03 +00:00
Paul Hu
8fae1ba057 Update tethering notification strings
Update strings after converged with carrier.

Bug: 145629001
Bug: 147818698
Test: atests TetheringTests
Change-Id: I8ad34e8c93ba1547aa397a8e9c0ecc15286a2b0b
Merged-In: I8ad34e8c93ba1547aa397a8e9c0ecc15286a2b0b
(cherry picked from commit d4a1bd7b73991c4197b49a3ff36e7683273ae736, aosp/1284584)
2020-04-14 11:18:09 +00:00
markchien
bdf1003c3b Do not stop IpServer when recieve wifi ap disabling state.
This is used to fix the race when quickly OFF/ON wifi tethering.
When IpServer is started/stopped, there is callback update tethering
interface status. Before this change, IpServer is stopped when wifi
ap is disabling. Then the next startTethering may fail in wifi because
wifi is in disabling state.
Error pattern: WifiService: Tethering is already active.
No unitest for this CL but it fixed the CtsTetheringTest flakty rate
than around 30% to 0 for more than 100 runs.

Bug: 153925821
Test: atest CtsTetheringTest --iteration 100
Change-Id: I8b65f621abe20799a3a0d410ba1f06368746ee49
2020-04-14 10:42:32 +00:00
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
6f532ba30f 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
Merged-In: I26d89a81f1c448d9b4809652b079a5f5eace3924
Change-Id: I26d89a81f1c448d9b4809652b079a5f5eace3924
2020-04-14 09:55:17 +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
markchien
7dc2dcc37a Change tethering file structure to respect its package name
Bug: 145099347
Test: atest TetheringTests
      atest CtsTetheringTest
Change-Id: I7401c550fbafd17a5ed2d925b5d0e17e358af467
Merged-In: I7401c550fbafd17a5ed2d925b5d0e17e358af467
2020-04-14 14:33:45 +08: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