Commit Graph

634 Commits

Author SHA1 Message Date
Chalard Jean
bc380e0215 Merge "[TNU06] Add roaming notification" am: 565160c302 am: 8f365b0b13
Change-Id: Ia02ca67be0a103e980be6a4c7a0ed66836716d51
2020-04-17 16:28:53 +00:00
Chalard Jean
8f365b0b13 Merge "[TNU06] Add roaming notification" am: 565160c302
Change-Id: I8f66563665375bdde40b59c997b9aba197f04dbd
2020-04-17 16:17:50 +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
fa5d45614b [automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

Change-Id: I3e83abed81dbb6ee37e4f0545462f2365d162778
2020-04-17 01:15:49 +00:00
Paul Hu
5e9c40c012 [TNU05.1] Address aosp/1237036 leftover comments
Bug: 147818698
Test: atest TetheringTests
Change-Id: Ife738339aeae00d2063fea6918b50204daef24fc
Merged-In: Ife738339aeae00d2063fea6918b50204daef24fc
(cherry picked from commit c638ae6436509df092ab8814bb5b64591878229d, aosp/1287133)
2020-04-16 16:51:00 +00:00
Mark Chien
8fb063eab4 [automerger skipped] Merge "Remove sendMessage inside EntitlementManager" into rvc-dev am: f9a1c42408 -s ours
am skip reason: Change-Id I0a376d28b123eaab2e8d00a98a4719ce983d3bb2 with SHA-1 a1a0be93f0 is in history

Change-Id: I18801202ca02270291d3e04cef2622bddc5a6bcc
2020-04-16 10:25:36 +00:00
Mark Chien
f9a1c42408 Merge "Remove sendMessage inside EntitlementManager" into rvc-dev 2020-04-16 09:57:22 +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
a91e5e5da6 Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac
Change-Id: I9276b698b97d317ba465ab162d191c05841593e0
2020-04-16 08:39:20 +00:00
Paul Hu
472ed1f496 [automerger skipped] Merge "[TNU05] Add no upstream notification" into rvc-dev am: b06fc85269 -s ours
am skip reason: Change-Id Ic6557f9f7703337596100cd6a477fd7239217166 with SHA-1 648fc2c8ea is in history

Change-Id: I737875975042fd9e3a28aa0275707be6d1425751
2020-04-16 08:36:25 +00:00
Paul Hu
14fb7f6fac Merge "[TNU05.1] Address aosp/1237036 leftover comments" 2020-04-16 08:25:24 +00:00
Mark Chien
30c0da71b0 Remove sendMessage inside EntitlementManager
EntitlementManager and its callers(Tethering and UpstreamNetworkMonitor)
run in the same threads.

Bug: 141256482
Test: atest TetheringTests
Merged-In: I0a376d28b123eaab2e8d00a98a4719ce983d3bb2
Change-Id: I0a376d28b123eaab2e8d00a98a4719ce983d3bb2
2020-04-16 08:08:04 +00:00
Paul Hu
43902ad1d8 [automerger skipped] Merge "Add TetheringCoverageTests" am: baf4513d45 am: d7269fc22b -s ours
am skip reason: Change-Id I1f2a50f16894b05e988476520ba25baba0b60d88 with SHA-1 d1ebb1e348 is in history

Change-Id: If929d2f89253a13370f5c99295d59811bb2f4038
2020-04-16 06:47:19 +00:00
Paul Hu
af6a2a33f5 [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
Merged-In: Ic6557f9f7703337596100cd6a477fd7239217166
(cherry picked from commit ac1b098acc504b60e85b3dcd22941f4e293865ae, aosp/1237036)
2020-04-16 06:43:19 +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
d7269fc22b Merge "Add TetheringCoverageTests" am: baf4513d45
Change-Id: I5683724edc60b5c3de326f75488f3eb738aaef47
2020-04-16 06:27:43 +00:00
Paul Hu
baf4513d45 Merge "Add TetheringCoverageTests" 2020-04-16 06:00:07 +00:00
Mark Chien
59b47f9fca [automerger skipped] Merge "Do not stop IpServer when recieve wifi ap disabling state." into rvc-dev am: b28fd19f26 -s ours
am skip reason: Change-Id I8b65f621abe20799a3a0d410ba1f06368746ee49 with SHA-1 bdf1003c3b is in history

Change-Id: I509ef90e3be236b7a3fcc35242d79e3d5cf7093d
2020-04-16 03:26:36 +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
2acc78a6a9 Merge "Remove sendMessage inside EntitlementManager" am: b4624df935
Change-Id: Idf6401f994aa6f1dee01420eec8c951bc3893863
2020-04-16 02:24:18 +00:00
Mark Chien
8c98b3d35e 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
Merged-In: I8b65f621abe20799a3a0d410ba1f06368746ee49
Change-Id: I8b65f621abe20799a3a0d410ba1f06368746ee49
2020-04-16 02:09:48 +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
7cda806393 Merge "[TNU05] Add no upstream notification" am: b353c7eac3
Change-Id: Id93a2eef90804bcbd35398f9633600fc858be2b1
2020-04-16 01:47:34 +00:00
Paul Hu
b353c7eac3 Merge "[TNU05] Add no upstream notification" 2020-04-16 01:31:06 +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
Mark Chien
7018843a2e Merge "Do not stop IpServer when recieve wifi ap disabling state." am: 197e35198d
Change-Id: I83e9cfc0f7b71f36f447dd4c4b5fa7b66ae3d11c
2020-04-15 17:03:49 +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
Paul Hu
1c1c17c09d Merge "Add TetheringCoverageTests" into rvc-dev am: 82a29a3308
Change-Id: If5e84d9fad417a12fe1493eff12fce6aaead9050
2020-04-15 00:51:51 +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
48b8904ac4 Merge "Change tethering file structure to respect its package name" into rvc-dev-plus-aosp 2020-04-14 14:45:48 +00:00
Paul Hu
087b32037a [automerger skipped] Merge "Update tethering notification strings" into rvc-dev am: 13113c4502 -s ours
am skip reason: Change-Id I8ad34e8c93ba1547aa397a8e9c0ecc15286a2b0b with SHA-1 735047bf6e is in history

Change-Id: I34f2e3864056ac908da4c312b982eee102db0342
2020-04-14 14:32:11 +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
TreeHugger Robot
47b038a734 [automerger skipped] Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." into rvc-dev am: 3edb9babf2 -s ours
am skip reason: Change-Id I26d89a81f1c448d9b4809652b079a5f5eace3924 with SHA-1 330a9b9fa7 is in history

Change-Id: If5985ff96dcaf48e6cbc61d88464c4ab9cc5be56
2020-04-14 12:43:46 +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
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
Mark Chien
de4fb9898c [automerger skipped] Merge "Change tethering file structure to respect its package name" into rvc-dev am: ee6107e51c -s ours
am skip reason: Change-Id I7401c550fbafd17a5ed2d925b5d0e17e358af467 with SHA-1 d995566700 is in history

Change-Id: I0994b834ff0af2ebee3cd7e5bc9c73c4b08a4c99
2020-04-14 09:45:14 +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
Mark Chien
1cfb5e6365 [automerger skipped] Merge "Change tethering file structure to respect its package name" am: c31e88ace6 am: 9fce5bc8b9 -s ours
am skip reason: skipped by user markchien

Change-Id: I23b0ffb1f366f980bc7c9c3b4c061214b8199307
2020-04-14 09:19:38 +00:00
Lorenzo Colitti
81dd21611d Merge "Don't crash when receiving an RTM_DELNEIGH or NUD_FAILED." am: 941a53ce91
Change-Id: I62dd1888231eb13c4c5bcc2c4c4d95e47c5b8aaa
2020-04-14 08:40:35 +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
26b3b4e0de Merge "Update tethering notification strings" am: 6f6527e2d7
Change-Id: I1af1b1a8664662ebdffba1b08725b4e505c222f4
2020-04-14 07:32:32 +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