Commit Graph

1278 Commits

Author SHA1 Message Date
Mark Chien
8a59938ea6 Merge "Adjust TTL for ipv6 tethering" am: 6d0a178a6b am: 23450e1fd1 am: 916f0d9420
Change-Id: I8ea7ab99284dc53cd84ae02c001469c570967a24
2020-05-25 02:21:04 +00:00
Mark Chien
916f0d9420 Merge "Adjust TTL for ipv6 tethering" am: 6d0a178a6b am: 23450e1fd1
Change-Id: I73c02d9ad80080a76e8d04d1d61467b434a68732
2020-05-25 02:04:59 +00:00
Mark Chien
23450e1fd1 Merge "Adjust TTL for ipv6 tethering" am: 6d0a178a6b
Change-Id: I80491fd3f1f344d17617aa238128cee39ce8e79f
2020-05-25 01:55:01 +00:00
Mark Chien
6d0a178a6b Merge "Adjust TTL for ipv6 tethering" 2020-05-25 01:42:36 +00:00
markchien
d63c4f35de Adjust TTL for ipv6 tethering
If upstream is cellular, set the TTL in Router Advertisements to
"network-set TTL - 1" for carrier requirement. For other non-cellular
upstream, set TTL as "network-set TTL + 1" to preventing arbitrary
distinction between tethered and untethered traffic.

Bug: 154776299
Test: atest TetheringTests

Change-Id: I7f2696a642f96c6aafb5613b980bf5bcdd08bbda
2020-05-24 22:52:44 +08:00
Mark Chien
7c21d5afe6 Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee am: b46dcf8317 am: 0454f82509
Change-Id: I7485ea109e0b8b4af4f21074b4a9d633c8a6596a
2020-05-21 08:46:26 +00:00
Mark Chien
0454f82509 Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee am: b46dcf8317
Change-Id: I82825eeded51f779325291cc1142cb1d6111915b
2020-05-21 08:31:37 +00:00
Mark Chien
b46dcf8317 Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee
Change-Id: If9674488fca6833556733efc8fbda230b93e798a
2020-05-21 08:11:47 +00:00
markchien
f4394e83f8 Fix TetheringServiceTest test WRITE_SETTINGS permission failure
AdoptShellPermissionIdentity can not pass permission check by
Settings#checkAndNoteWriteSettingsOperation. It would compare the caller
uid and its package name. See error below:
1. java.lang.SecurityException:
Specified package com.android.shell under uid 10239 but it is really 2000
2. java.lang.SecurityException:
uid 10245 does not have android.permission.UPDATE_APP_OPS_STATS.

Override the method and test if caller hold WRITE_SETTINGS directly.

Bug: 154869719
Test: TetheringTests, TetheringCoverageTests, NetworkStackNextTests,
NetworkStackCoverageTests

Change-Id: I2a60c4d66ef30028f9663159f85464ea815248e2
2020-05-20 16:56:33 +08:00
Treehugger Robot
62441b61e2 Merge "TetheringServiceTest: test caller permission" am: 366eae572d am: e46a70cbfe am: 8592480922
Change-Id: I687d32964a7b54e3e5f6ead254efb2ec39a5a351
2020-05-19 03:46:38 +00:00
Treehugger Robot
8592480922 Merge "TetheringServiceTest: test caller permission" am: 366eae572d am: e46a70cbfe
Change-Id: Ia1c0ec986750a04290d3125882d00c18f4213ae7
2020-05-19 03:21:42 +00:00
Treehugger Robot
e46a70cbfe Merge "TetheringServiceTest: test caller permission" am: 366eae572d
Change-Id: I5064eb5e27d7803c0f86b75c391b56f1e3cb4d7d
2020-05-19 03:07:55 +00:00
Treehugger Robot
366eae572d Merge "TetheringServiceTest: test caller permission" 2020-05-19 02:40:03 +00:00
markchien
2a1656d3f8 TetheringServiceTest: test caller permission
Bug: 154869719
Test: atest TetheringTests
Change-Id: I7beea3f011d930e433443ed62d772a3f8cce5d78
2020-05-19 09:04:43 +08:00
Mark Chien
5f628ea21f [automerger skipped] Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b -s ours am: 2326aa2bde -s ours
am skip reason: Change-Id Id9c0397306f3872fc23520d1354f338035a96dc9 with SHA-1 91b2bda682 is in history

Change-Id: I1d7898bdf9f70461135e393cbb48df8c3cbb438a
2020-05-15 16:20:48 +00:00
Mark Chien
e5ba7b8830 [automerger skipped] Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b am: 8efcb8817e -s ours
am skip reason: Change-Id Id9c0397306f3872fc23520d1354f338035a96dc9 with SHA-1 74174690d1 is in history

Change-Id: I019faa77b3dd7716df9700ba5760488d287093eb
2020-05-15 16:04:28 +00:00
Mark Chien
cf979b9f02 [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564 -s ours am: 72856af566 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 c96e106d68 is in history

Change-Id: I0250755a183455cf777ba1f1941f3c7422da41c6
2020-05-15 16:03:28 +00:00
Mark Chien
2326aa2bde [automerger skipped] Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b -s ours
am skip reason: Change-Id Id9c0397306f3872fc23520d1354f338035a96dc9 with SHA-1 74174690d1 is in history

Change-Id: I847a1160b72c8ab384a369f7be73a237f94c8d85
2020-05-15 16:03:17 +00:00
Mark Chien
72856af566 [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I5e957bffc276a3d2c0917ae61ec180fa4256f875
2020-05-15 15:46:43 +00:00
Mark Chien
6c2ea9488a [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564 am: b83de9ff49 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: If701ee4b6070a87622b4b23230caee670b2593c6
2020-05-15 15:44:54 +00:00
Mark Chien
8efcb8817e Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b
Change-Id: I7e85c0d8cdcca92943e81f6d08520c8b9e6d6bb3
2020-05-15 00:07:48 +00:00
Treehugger Robot
91b2bda682 Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests
Bug: 156557122
Test: atest TetheringTests

Merged-In: Id9c0397306f3872fc23520d1354f338035a96dc9
Change-Id: Id9c0397306f3872fc23520d1354f338035a96dc9
2020-05-14 17:16:39 +00:00
Treehugger Robot
8620df0331 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580 am: 61aba704a9 am: dd8e64609a
Change-Id: I09cf0b243adb6a8a1989d1cacb64c002e52c047e
2020-05-14 16:48:11 +00:00
Treehugger Robot
dd8e64609a Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580 am: 61aba704a9
Change-Id: I246e4f0d90e95418cbf55db5b802997faf4eae66
2020-05-14 16:33:30 +00:00
Treehugger Robot
61aba704a9 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580
Change-Id: Id517f4122c4b078d16035274e8979247bc0b40f8
2020-05-14 16:18:24 +00:00
Treehugger Robot
fb2caff580 Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" 2020-05-14 16:00:27 +00:00
markchien
74174690d1 Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests
Bug: 156557122
Test: atest TetheringTests

Change-Id: Id9c0397306f3872fc23520d1354f338035a96dc9
2020-05-14 16:42:22 +08:00
Xiao Ma
18189bfea0 Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc am: cad22f9192
Change-Id: Ife81d2f70d9746a37962a44a157d8314e9f230a0
2020-05-14 07:03:46 +00:00
Xiao Ma
cad22f9192 Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc am: b80b1e09bc
Change-Id: I415ba816492a329d5632e49025284d700b3c14da
2020-05-14 06:52:59 +00:00
Xiao Ma
b80b1e09bc Merge "Support MirrorLink DHCPDECLINE." am: cc755bf9fc
Change-Id: I7082734a50da23488d1369dd6390f7c0ec2c1e0b
2020-05-14 06:41:36 +00:00
Xiao Ma
cc755bf9fc Merge "Support MirrorLink DHCPDECLINE." 2020-05-14 06:27:16 +00:00
Mark Chien
b83de9ff49 Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564
Change-Id: I7ec8dbc97ea3ccceac7e2fafc4ab5d53ccd7a630
2020-05-14 05:59:11 +00:00
Mark Chien
73260a5564 Merge "Make members final in TetheringService" into rvc-dev 2020-05-14 05:48:24 +00:00
Treehugger Robot
8a92d0307c [automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours am: 41a5e3114a -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I90080b06374765008d228e7dcd54c9e3dc62e4ce
2020-05-13 16:30:59 +00:00
Treehugger Robot
41a5e3114a [automerger skipped] Merge "Make members final in TetheringService" am: 7e2180f019 am: 6636efb050 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: I521d758718b53c2e455e84acc69f703a082dddf2
2020-05-13 16:29:13 +00:00
Treehugger Robot
6636efb050 Merge "Make members final in TetheringService" am: 7e2180f019
Change-Id: I64e0d2512a31310948cdd106943d9f7345209fb7
2020-05-13 16:14:28 +00:00
Treehugger Robot
7e2180f019 Merge "Make members final in TetheringService" 2020-05-13 16:04:58 +00:00
Mark Chien
1c4d9eda63 Merge "Make members final in TetheringService" into rvc-dev-plus-aosp am: 997648de38
Change-Id: I765e771b33787d905a6c22396fa26221e9f7957f
2020-05-13 15:58:42 +00:00
Mark Chien
997648de38 Merge "Make members final in TetheringService" into rvc-dev-plus-aosp 2020-05-13 15:54:16 +00:00
Nucca Chen
b7474012d9 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 -s ours am: e49e3dd8d6 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 fd8b4bbe35 is in history

Change-Id: I66d4cca9205a4e56f15edb92f9772127d7c2535d
2020-05-13 15:39:17 +00:00
Nucca Chen
0f0a6345d2 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 am: 9aba72f7b8 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

Change-Id: I7cfe54127b3f62a211a6fc6f591d8d6a61c9ed11
2020-05-13 15:39:04 +00:00
Nucca Chen
e49e3dd8d6 [automerger skipped] Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5 -s ours
am skip reason: Change-Id If9c8bc6f785fa80575db56de4e223292e9807ace with SHA-1 5bc3af9a57 is in history

Change-Id: I3db1b057e79f59a653d925e9e2116d3415d5307d
2020-05-13 15:19:44 +00:00
Nucca Chen
9aba72f7b8 Merge "A minor followup change for BPF offload device option stuff" into rvc-dev am: 8517d037e5
Change-Id: I92b45a1b7d3cb6b05bfb8abd28111d9f0ad3e1a4
2020-05-13 15:19:42 +00:00
markchien
bd2cbe6c73 Make members final in TetheringService
1. Move isTetheringSupport logic from TetheringService to Tethering.
2. Small readability improvement in TetheringTest. Also change
config_tether_upstream_automatic from false to true in TetheringTest.
So TetheringTests would default run automatic select upstream flow
instead of selecting by legacy perferred network type list.

Bug: 153609486
Test: atest TetheringTest
Change-Id: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
Merged-In: I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f
(cherry picked from commit 569870320a)
2020-05-13 15:07:00 +00:00
Paul Duffin
7da2f31705 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours am: 2105fe72f5 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 b016744a1a is in history

Change-Id: I94c6c4d2bb1f9561adfc94054c9017f352b4e473
2020-05-13 15:02:54 +00:00
Paul Duffin
1c15bee4c0 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 am: a6fe2f4797 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 82e7165284 is in history

Change-Id: I87073ac1fd13a2bc5d6dbbaeb1ffb09c8dcadd73
2020-05-13 15:02:42 +00:00
Nucca Chen
8517d037e5 Merge "A minor followup change for BPF offload device option stuff" into rvc-dev 2020-05-13 14:58:34 +00:00
Paul Duffin
a6fe2f4797 Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461
Change-Id: I5d84b91a5aa123db4d988beb9ee287e52186e8d8
2020-05-13 14:47:57 +00:00
Paul Duffin
2105fe72f5 [automerger skipped] Merge "Cleanup packages/Tethering/common/TetheringLib" into rvc-dev am: 85f2c79461 -s ours
am skip reason: Change-Id I4583539d11ba69320aa5a0dfcfee072c81affac2 with SHA-1 82e7165284 is in history

Change-Id: Ie55bd4c01469bae5361da8f692c9e17121379d4a
2020-05-13 14:47:54 +00:00
Xiao Ma
4455d6b1bd Support MirrorLink DHCPDECLINE.
Add the specific implementation of onNewPrefixRequest callback
on IpServer side, also refactor some common code.

Bug: 130741856
Test: atest TetheringTests
Change-Id: If2871bf899cb5890bbfee18063a194c92b6f474e
2020-05-13 23:29:49 +09:00