Commit Graph

1714 Commits

Author SHA1 Message Date
Mark Chien
5aec4c3aca [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 am: e1104843bc -s ours am: a1848d7d8f -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 2a1656d3f8 is in history

Change-Id: Iff1f24127bcbcc802a5ebfab5e6120255beb2cac
2020-05-25 11:16:57 +00:00
Mark Chien
a1848d7d8f [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 am: e1104843bc -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 2a1656d3f8 is in history

Change-Id: Ie44fa3cc03668bf5c27b12c8e729ecd1fca899d5
2020-05-25 11:03:22 +00:00
Mark Chien
e1104843bc Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372
Change-Id: I222b17b982f9d9aa9bc39ab0285cfce5accab221
2020-05-25 10:52:23 +00:00
Mark Chien
5026370372 Merge "TetheringServiceTest: test caller permission" into rvc-dev 2020-05-25 10:40:03 +00:00
Xiao Ma
1b214684ee [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 am: 5ac55156f5 -s ours am: d3a5c7a004 -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 654013479b is in history

Change-Id: I39dd2f4f85a49822c199f93cdfc41ffd4aab6a57
2020-05-25 09:36:46 +00:00
Xiao Ma
63e3e280ca [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 -s ours am: 0071dfee6e -s ours am: f81229062d -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 654013479b is in history

Change-Id: I2e8fe36a40923ed34a114c3e2d72aac767853da8
2020-05-25 09:35:15 +00:00
Xiao Ma
6ed2d4d635 [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 am: 5ac55156f5 am: 017c95b164 -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 4455d6b1bd is in history

Change-Id: I7ddc3beca5d7d0e48b489808433cd68484afd7fe
2020-05-25 09:33:53 +00:00
Xiao Ma
d3a5c7a004 [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 am: 5ac55156f5 -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 654013479b is in history

Change-Id: I2dc8e9ee55c976c4b9aad64d1c8d502ee5fdd177
2020-05-25 09:22:39 +00:00
Xiao Ma
f81229062d [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 -s ours am: 0071dfee6e -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 4455d6b1bd is in history

Change-Id: I475361add9564675a99e99beb9b7e6f8fe53387d
2020-05-25 09:22:03 +00:00
Xiao Ma
5ac55156f5 Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6
Change-Id: I265e59acabf695b2386defc0938d7386c8fe5270
2020-05-25 09:18:48 +00:00
Xiao Ma
0071dfee6e [automerger skipped] Merge "Support MirrorLink DHCPDECLINE." into rvc-dev am: 3ab17953c6 -s ours
am skip reason: Change-Id If2871bf899cb5890bbfee18063a194c92b6f474e with SHA-1 4455d6b1bd is in history

Change-Id: I69ac4260782960199c08369c6fb99f62251e7222
2020-05-25 09:15:37 +00:00
markchien
5232658de2 TetheringServiceTest: test caller permission
Bug: 154869719
Test: atest TetheringTests
Original-Change: https://android-review.googlesource.com/1288503

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
Original-Change: https://android-review.googlesource.com/1313806

Change-Id: I7beea3f011d930e433443ed62d772a3f8cce5d78
Merged-In: I7beea3f011d930e433443ed62d772a3f8cce5d78
2020-05-25 12:07:06 +08:00
Mark Chien
b537f0832c Merge "Adjust TTL for ipv6 tethering" am: 6d0a178a6b am: 23450e1fd1 am: 916f0d9420 am: 8a59938ea6
Change-Id: Ic03f93e4d2d4e0af6a01ccbb80153c87f1d5f97b
2020-05-25 02:34:35 +00:00
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
6c8312192e Merge "Fix TetheringServiceTest test WRITE_SETTINGS permission failure" am: 7e8b14abee am: b46dcf8317 am: 0454f82509 am: 7c21d5afe6
Change-Id: I80687fc36f6a72f7a79987f90447554989c11a26
2020-05-21 09:01:35 +00: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
cd75eef31a Merge "TetheringServiceTest: test caller permission" am: 366eae572d am: e46a70cbfe am: 8592480922 am: 62441b61e2
Change-Id: I2d2add45a45060ffb8ba5b909a016a59c9e02d72
2020-05-19 03:59:24 +00: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
Xiao Ma
654013479b Support MirrorLink DHCPDECLINE.
Add the specific implementation of onNewPrefixRequest callback
on IpServer side, also refactor some common code.

Bug: 130741856
Test: atest TetheringTests
Merged-In: If2871bf899cb5890bbfee18063a194c92b6f474e
Change-Id: If2871bf899cb5890bbfee18063a194c92b6f474e
2020-05-18 14:23:13 +00:00
Mark Chien
59bd3e6564 [automerger skipped] Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b -s ours am: 2326aa2bde -s ours am: 5f628ea21f -s ours
am skip reason: Change-Id Id9c0397306f3872fc23520d1354f338035a96dc9 with SHA-1 91b2bda682 is in history

Change-Id: Ib33f015645995f2ec5f1888b71484d323ad4ccdc
2020-05-15 16:42:13 +00:00
Automerger Merge Worker
763c17c1ed Merge "[automerger skipped] Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" into rvc-dev am: 1c65357c4b am: 8efcb8817e -s ours" into rvc-d1-dev-plus-aosp am: 7dbd241684 -s ours
am skip reason: Change-Id Id9c0397306f3872fc23520d1354f338035a96dc9 with SHA-1 91b2bda682 is in history

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

Change-Id: I3863019ff2ce4dd9dab05477596497eceb6da3f5
2020-05-15 16:23:26 +00: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
e97864f789 [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564 am: b83de9ff49 -s ours am: 6c2ea9488a -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 c96e106d68 is in history

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

Change-Id: I62ece4d72c23cf589bd929e10cf370764110dce8
2020-05-15 16:04:44 +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
4547fdc26b [automerger skipped] Merge "Make members final in TetheringService" into rvc-dev am: 73260a5564 am: b83de9ff49 am: 74349dfd92 -s ours
am skip reason: Change-Id I5a82a6347f62d3a7031db5c56e8e0c8530dafd8f with SHA-1 bd2cbe6c73 is in history

Change-Id: Iafa14737aaefb5e3409a106e0a166a26325bd71f
2020-05-15 15:45:10 +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
cb7eb76aac Merge "Fix READ_DEVICE_CONFIG permission denied problem in TetheringTests" am: fb2caff580 am: 61aba704a9 am: dd8e64609a am: 8620df0331
Change-Id: Id6e98628f5b7bc0dddf195571d6ffb89e9d86520
2020-05-14 17:02:56 +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