Commit Graph

1763 Commits

Author SHA1 Message Date
Mark Chien
ee89e03498 [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b am: 86780d3db9 -s ours am: 6e4df2bbea -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: Iffcb69ef26033a5d17dcb05a014d98e9dc33cb63
2020-05-29 06:50:12 +00:00
Mark Chien
6e4df2bbea [automerger skipped] Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b am: 86780d3db9 -s ours
am skip reason: Change-Id I45e8e8d737486def9d0de8943ec7f09ca0942a0b with SHA-1 908518d8e2 is in history

Change-Id: I8e1a67cf3573d0294e5585cb794ea5265a9486a3
2020-05-29 06:38:49 +00:00
Mark Chien
86780d3db9 Merge "Extend timeout for requesting tethered interface" into rvc-dev am: 40a9eb779b
Change-Id: I762c9ac79b181a409e6aa2b362665a9f94a62a6d
2020-05-29 06:25:08 +00:00
Mark Chien
40a9eb779b Merge "Extend timeout for requesting tethered interface" into rvc-dev 2020-05-29 06:11:12 +00:00
Paul Duffin
d38049c6c9 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: 0135bd56b3 am: a088f4ddfa
Change-Id: I10e5dd11013a32db055c52fedff9587ca3d0cf2a
2020-05-28 21:48:09 +00:00
Paul Duffin
a088f4ddfa Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: 0135bd56b3
Change-Id: I3cc810ee63810855d1acfe5cddd156d33ed47567
2020-05-28 21:34:23 +00:00
Paul Duffin
0135bd56b3 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f
Change-Id: I509bba81369d935cb869e313ac7ae9930fbadbf4
2020-05-28 21:23:58 +00:00
Paul Duffin
81e7d45cb7 [automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours am: 027e07d72d -s ours am: fdcbc6042a -s ours
am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 cbac8e0b63 is in history

Change-Id: I6379d3afe817057eec201635c63558847e2de3ee
2020-05-28 16:01:03 +00:00
Paul Duffin
fdcbc6042a [automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours am: 027e07d72d -s ours
am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 cbac8e0b63 is in history

Change-Id: I39ea3325d903b1f3170e6304d83dcc3d257ea113
2020-05-28 15:44:25 +00:00
Paul Duffin
027e07d72d [automerger skipped] Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753 am: d65294b376 -s ours
am skip reason: Change-Id Id1c2e848430c49a2da7402244814cd084f5da77c with SHA-1 cbac8e0b63 is in history

Change-Id: I1f0759e84c6f7e17427165fc6db9dd7531284e8a
2020-05-28 15:29:34 +00:00
Paul Duffin
d65294b376 Merge "Switch framework-tethering to use java_sdk_library" am: b5bf211753
Change-Id: I9e5526a23087dd9d9610b4ce5e29e28a7dfdda4f
2020-05-28 15:18:36 +00:00
Paul Duffin
b5bf211753 Merge "Switch framework-tethering to use java_sdk_library" 2020-05-28 15:01:46 +00:00
Paul Duffin
eec4633145 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: 6216a6904e am: 2744465710
Change-Id: Ic769e747c5090c905a1e723b5123880cf6eb726a
2020-05-28 13:38:47 +00:00
Paul Duffin
2744465710 Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f am: 6216a6904e
Change-Id: Ic732265e75f86e9aa5c523ae1ced9ff2b92e220a
2020-05-28 13:24:45 +00:00
Paul Duffin
2dae272903 Switch framework-tethering to use java_sdk_library
The names of the individual modules do not quite follow the pattern
that java_sdk_library uses so this temporarily sets the following:
    naming_scheme: "frameworks-modules"

That causes java_sdk_library to use a naming scheme that matches the
one used by the individual modules of this. It will be cleaned up
later.

Part of the purpose of the java_sdk_library is to hide the
implementation code and force users of the library to depend on stubs
for a well defined API. Ideally, it would allow access to the
implementation in those cases where it is safe, e.g. from within the
same APEX, or from tests for the implementation. Unfortunately, due to
limitations in the build it does not yet have enough information to
make that decision correctly which means that any code that needs to
compile against the implementation is broken which would prevent us
from converting the module to java_sdk_library.

However, the only way to provide the additional information to allow
the implementation to be correctly exposed is to convert the modules
to java_sdk_library; a cycle.

In order to break that cycle the java_sdk_library creates a special
<module>.impl target which is used directly by tests and any other code
that needs it. Once all the modules have been converted to a
java_sdk_library then we can resolve the limitations in the build and
remove the direct references to <module>.impl.

Test: m update-api
Bug: 155164730
Merged-In: If5c115f482751f9f4b5f047e9e401a18e36799ef
Merged-In: Id1c2e848430c49a2da7402244814cd084f5da77c
Change-Id: Id1c2e848430c49a2da7402244814cd084f5da77c
2020-05-28 13:14:52 +00:00
Paul Duffin
6216a6904e Merge "Switch framework-tethering to use java_sdk_library" into rvc-dev am: 5e988a656f
Change-Id: Icf8a3b8eed7e85065d54f2f48d8cb6f05974de00
2020-05-28 13:09:48 +00:00
Paul Duffin
cbac8e0b63 Switch framework-tethering to use java_sdk_library
The names of the individual modules do not quite follow the pattern
that java_sdk_library uses so this temporarily sets the following:
    naming_scheme: "frameworks-modules"

That causes java_sdk_library to use a naming scheme that matches the
one used by the individual modules of this. It will be cleaned up
later.

Part of the purpose of the java_sdk_library is to hide the
implementation code and force users of the library to depend on stubs
for a well defined API. Ideally, it would allow access to the
implementation in those cases where it is safe, e.g. from within the
same APEX, or from tests for the implementation. Unfortunately, due to
limitations in the build it does not yet have enough information to
make that decision correctly which means that any code that needs to
compile against the implementation is broken which would prevent us
from converting the module to java_sdk_library.

However, the only way to provide the additional information to allow
the implementation to be correctly exposed is to convert the modules
to java_sdk_library; a cycle.

In order to break that cycle the java_sdk_library creates a special
<module>.impl target which is used directly by tests and any other code
that needs it. Once all the modules have been converted to a
java_sdk_library then we can resolve the limitations in the build and
remove the direct references to <module>.impl.

Test: m Tethering InProcessTethering checkapi
Bug: 155164730
Merged-In: If5c115f482751f9f4b5f047e9e401a18e36799ef
Change-Id: Id1c2e848430c49a2da7402244814cd084f5da77c
2020-05-28 12:50:04 +01:00
Treehugger Robot
831c6a697c Merge "Extend timeout for requesting tethered interface" am: 95386f9ebd am: 0c71ef1a6f am: 99466515f8 am: 40ef082118
Change-Id: I6677419621d87f72eb9b74b65a3d913fad698414
2020-05-28 09:21:21 +00:00
Treehugger Robot
9c9c600c16 Extend timeout for requesting tethered interface
Extend the timeout to lower the EthernetTetheringTest flaky.

Besides, also explicitly exempt entitlement check in
EtetherntTetheringTest because it do not test tethering upstream
currently. Thus, the tests would not be interrupted by entitlement
check if test SIM is entitlement required.

Bug: 156713866
Test: TetheringCoverageTests, CtsTehteringTest

Merged-In: I45e8e8d737486def9d0de8943ec7f09ca0942a0b
Change-Id: I45e8e8d737486def9d0de8943ec7f09ca0942a0b
2020-05-28 09:17:28 +00:00
Treehugger Robot
40ef082118 Merge "Extend timeout for requesting tethered interface" am: 95386f9ebd am: 0c71ef1a6f am: 99466515f8
Change-Id: I7a22f2fe8bf3c3a6a03dcf949fe0daaa91d0ec94
2020-05-28 09:01:57 +00:00
Treehugger Robot
99466515f8 Merge "Extend timeout for requesting tethered interface" am: 95386f9ebd am: 0c71ef1a6f
Change-Id: I577127f79391a4859dc7324b8cc47729a807a165
2020-05-28 08:50:08 +00:00
Treehugger Robot
0c71ef1a6f Merge "Extend timeout for requesting tethered interface" am: 95386f9ebd
Change-Id: I2336a5aeeda958048d6e8b24ff0015ab45a66397
2020-05-28 08:34:24 +00:00
Treehugger Robot
95386f9ebd Merge "Extend timeout for requesting tethered interface" 2020-05-28 08:19:10 +00:00
markchien
908518d8e2 Extend timeout for requesting tethered interface
Extend the timeout to lower the EthernetTetheringTest flaky.

Besides, also explicitly exempt entitlement check in
EtetherntTetheringTest because it do not test tethering upstream
currently. Thus, the tests would not be interrupted by entitlement
check if test SIM is entitlement required.

Bug: 156713866
Test: TetheringCoverageTests, CtsTehteringTest

Change-Id: I45e8e8d737486def9d0de8943ec7f09ca0942a0b
2020-05-28 12:13:14 +08:00
Automerger Merge Worker
d8b47c2913 Merge "[automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 -s ours am: 967f044f83 -s ours am: 4b544f2317 -s ours" into rvc-qpr-dev-plus-aosp 2020-05-27 12:55:23 +00:00
Mark Chien
3f9fbe5cff [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 -s ours am: 967f044f83 -s ours am: 4b544f2317 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 369fd25f79 is in history

Change-Id: I4cd2582ff27a28cc9f495e93b18521e8de56fd60
2020-05-27 12:55:13 +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
4b544f2317 [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 -s ours am: 967f044f83 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 369fd25f79 is in history

Change-Id: I7c1d1fea95eb5a98363a8410d8a9e1b9b4fd47f2
2020-05-27 12:37:33 +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
Mark Chien
967f044f83 [automerger skipped] Merge "Remove platform cert from Tethering tests" into rvc-dev am: 041f00f991 -s ours
am skip reason: Change-Id I7c539f1f4a447b5913164b222601c6113c6fe645 with SHA-1 e79e02e5c4 is in history

Change-Id: Ib11ad54c4a32b96ca60530c0ea0806fe2f24b67b
2020-05-27 12:16:59 +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
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
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
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