Commit Graph

2124 Commits

Author SHA1 Message Date
Automerger Merge Worker
16f59266a0 Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 am: 8b3d65dc78 -s ours" into rvc-qpr-dev-plus-aosp am: 3f981fe742 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 369fd25f79 is in history

Change-Id: I5a2a841cde61562adead63562ae11824396cc582
2020-05-27 13:09:03 +00:00
Mark Chien
1f43fae33d [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 -s ours am: c4c7636865 -s ours am: 12a4b1f74b -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 e79e02e5c4 is in history

Change-Id: Ic2a858d1200f90a4b5e66f8333621463d880ef99
2020-05-27 13:08:24 +00:00
Automerger Merge Worker
3f981fe742 Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 am: 8b3d65dc78 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-27 12:55:12 +00:00
Mark Chien
3b6a7c30b7 [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 am: 8b3d65dc78 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 e79e02e5c4 is in history

Change-Id: I8929d523b1356fc8a7e38f1efe5cf9249123f18a
2020-05-27 12:54:57 +00:00
Mark Chien
12a4b1f74b [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 -s ours am: c4c7636865 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 e79e02e5c4 is in history

Change-Id: Ie41bae7c32a017ae640dcea4f9e0f647fa82d6d9
2020-05-27 12:54:54 +00:00
Mark Chien
c4c7636865 [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 am: 362c4cf543 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 e79e02e5c4 is in history

Change-Id: I701e22eb877cb7e1460b20f202a31fd54b9490f2
2020-05-27 12:37:05 +00:00
Mark Chien
362c4cf543 Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991
Change-Id: I760c52e95b3eaaf820ba3ddc1d91cf0c7adb16e0
2020-05-27 12:17:26 +00:00
Treehugger Robot
369fd25f79 Remove platform cert from Tethering tests
Bug: 156866746
Test: atest TetheringTests, TetheringCoverageTests
Merged-In: I7c539f1f4a447b5913164b222601c6113c6fe645
Change-Id: I7c539f1f4a447b5913164b222601c6113c6fe645
2020-05-27 09:27:27 +00:00
Automerger Merge Worker
24e318ef18 Merge "Merge "Remove platform cert from Tethering tests" am: a5e8d3f73d am: e88c5146da am: b4d272b13e" into rvc-d1-dev-plus-aosp am: b676d0c24e am: ed0d7a0542
Change-Id: Ie9ba610f5b0919e28d10132d42830d751c28d016
2020-05-27 05:15:53 +00:00
Automerger Merge Worker
ed0d7a0542 Merge "Merge "Remove platform cert from Tethering tests" am: a5e8d3f73d am: e88c5146da am: b4d272b13e" into rvc-d1-dev-plus-aosp am: b676d0c24e
Change-Id: Ib0180df15edbb6e7c502489cb8aa12d47c865a1f
2020-05-27 04:51:43 +00:00
Treehugger Robot
038c057faa Merge "Remove platform cert from Tethering tests" am: a5e8d3f73d am: e88c5146da am: b4d272b13e
Change-Id: I1e30faeb2a8e3e2801999fe78e3040a55d2f8059
2020-05-27 04:31:13 +00:00
Treehugger Robot
b4d272b13e Merge "Remove platform cert from Tethering tests" am: a5e8d3f73d am: e88c5146da
Change-Id: I51317f3769d60393a21ced8a194f253f97ef9ffd
2020-05-27 04:17:44 +00:00
Treehugger Robot
e88c5146da Merge "Remove platform cert from Tethering tests" am: a5e8d3f73d
Change-Id: If2177a9f24a9074ede3b90e083dbf6f3c88c1775
2020-05-27 04:07:39 +00:00
Mark Chien
c0a22a3b84 [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 -s ours am: ec52d43f0b -s ours am: 90d5239b3f -s ours am: cb2121d978 -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 cd309138ce is in history

Change-Id: I315e27a0d0f746009d5c39a6d446dcd667a0d307
2020-05-26 02:22:50 +00:00
Mark Chien
faf90aaf89 [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 am: d82cfdd7c5 -s ours am: fc49082a53 -s ours am: 7a4f5a544a -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 d63c4f35de is in history

Change-Id: I89b104cda9c1ad9b371e96ca016616453316bd56
2020-05-26 02:22:26 +00:00
Mark Chien
cb2121d978 [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 -s ours am: ec52d43f0b -s ours am: 90d5239b3f -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 cd309138ce is in history

Change-Id: Ic2f5c6865a0de366aae7f7793fe08577f3fb8756
2020-05-26 02:05:38 +00:00
Mark Chien
7a4f5a544a [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 am: d82cfdd7c5 -s ours am: fc49082a53 -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 d63c4f35de is in history

Change-Id: I0113d3fc6dba8dece1d1b85ac2ebfa059a632201
2020-05-26 02:05:30 +00:00
Mark Chien
90d5239b3f [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 -s ours am: ec52d43f0b -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 cd309138ce is in history

Change-Id: I8fdc6add461cbdd8059b90bb4d26c39c27293e2b
2020-05-26 01:48:55 +00:00
Mark Chien
fc49082a53 [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 am: d82cfdd7c5 -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 d63c4f35de is in history

Change-Id: Ib247a67ee676fab6b40f0d965ff1be9bcf9acece
2020-05-26 01:48:44 +00:00
Mark Chien
d82cfdd7c5 Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40
Change-Id: Ieab4a987aa056af29491c3d9080257ff7d4e119a
2020-05-26 01:38:23 +00:00
Mark Chien
ec52d43f0b [automerger skipped] Merge "Adjust TTL for ipv6 tethering" into rvc-dev am: d0355d7d40 -s ours
am skip reason: Change-Id I7f2696a642f96c6aafb5613b980bf5bcdd08bbda with SHA-1 d63c4f35de is in history

Change-Id: I76feb39b69ebb2d45873807a878e4d6c364b0a9b
2020-05-26 01:38:10 +00:00
markchien
e79e02e5c4 Remove platform cert from Tethering tests
Bug: 156866746
Test: atest TetheringTests, TetheringCoverageTests
Change-Id: I7c539f1f4a447b5913164b222601c6113c6fe645
2020-05-26 09:31:16 +08:00
Mark Chien
cd309138ce 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

Merged-In: I7f2696a642f96c6aafb5613b980bf5bcdd08bbda
Change-Id: I7f2696a642f96c6aafb5613b980bf5bcdd08bbda
2020-05-25 13:27:35 +00:00
Mark Chien
c1b11507d7 [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 -s ours am: 6cd572faa2 -s ours am: 75537a1762 -s ours am: 06da892be9 -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 5232658de2 is in history

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

Change-Id: I7f66dafd8cae6a652e4adca289c6c0d6e400798c
2020-05-25 11:30:08 +00:00
Mark Chien
06da892be9 [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 -s ours am: 6cd572faa2 -s ours am: 75537a1762 -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 5232658de2 is in history

Change-Id: Id14393f1fbc769b37f544f97b38df51ad8f7b2c2
2020-05-25 11:17:06 +00:00
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
75537a1762 [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 -s ours am: 6cd572faa2 -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 2a1656d3f8 is in history

Change-Id: I698d9684107bf6eed20fe71d4f47fde89374a730
2020-05-25 11:03:34 +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
6cd572faa2 [automerger skipped] Merge "TetheringServiceTest: test caller permission" into rvc-dev am: 5026370372 -s ours
am skip reason: Change-Id I7beea3f011d930e433443ed62d772a3f8cce5d78 with SHA-1 2a1656d3f8 is in history

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

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

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

Change-Id: I99f97ce19b16b3f4a2cf641155a7bebfb382ba19
2020-05-25 09:57:37 +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
099aa75c00 Merge "Adjust TTL for ipv6 tethering" am: 6d0a178a6b am: 23450e1fd1 am: 916f0d9420 am: 8a59938ea6 am: b537f0832c
Change-Id: I342f33076b1b02b940fda8d47de963ba13d3942b
2020-05-25 02:49:44 +00: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