Commit Graph

5299 Commits

Author SHA1 Message Date
Automerger Merge Worker
bbf6e29da3 [automerger skipped] Merge changes from topic "am-9dc7ccb81d8e485c895d2a6dfab067cc" into rvc-d1-dev-plus-aosp am: 2a55d3c9a8 -s ours am: d58e95008e -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 668dfa5998 is in history

Change-Id: I6faa45b0e571bc4820841c0f4c5e792e50e919d7
2020-04-25 01:48:19 +00:00
Mark Chien
7528bb3216 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours am: 1f03fbdeed -s ours am: bab8f69488 -s ours am: d18c47d669 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: Ia9cc5fc4d00ccebc6fc5ace2097c3caf0e962d70
2020-04-25 01:47:49 +00:00
Automerger Merge Worker
d58e95008e [automerger skipped] Merge changes from topic "am-9dc7ccb81d8e485c895d2a6dfab067cc" into rvc-d1-dev-plus-aosp am: 2a55d3c9a8 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 668dfa5998 is in history

Change-Id: I4a22e84fa1a8091cf4f6998b728895c89578c500
2020-04-25 01:34:52 +00:00
Mark Chien
d18c47d669 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours am: 1f03fbdeed -s ours am: bab8f69488 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I96b7035772d769c7e2590689cb8bef3e4218cb97
2020-04-25 01:34:44 +00:00
Automerger Merge Worker
2a55d3c9a8 Merge changes from topic "am-9dc7ccb81d8e485c895d2a6dfab067cc" into rvc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 am: d1fd7784bc -s ours
  [automerger skipped] Test legacy tether/untether API and onError callback am: a6b3b70278 am: eb970903c9 -s ours
2020-04-25 01:26:40 +00:00
Mark Chien
0524daa546 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 am: d1fd7784bc -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I901494f8d6fdf02e613873e131c36376f2ca4774
2020-04-25 01:26:34 +00:00
markchien
d8da41b6bc [automerger skipped] Test legacy tether/untether API and onError callback am: a6b3b70278 am: eb970903c9 -s ours
am skip reason: Change-Id Ifb3a0618208ffd0ff224c60f377036bc22ba0565 with SHA-1 1a54afc5b1 is in history

Change-Id: Iea0ae12e6cd4f63b57b02772f405b98548e91823
2020-04-25 01:26:31 +00:00
Mark Chien
bab8f69488 [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours am: 1f03fbdeed -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I7fa7ffe6918ba67994e6012530edc6fe2a75432f
2020-04-25 01:26:26 +00:00
Mark Chien
d1fd7784bc Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277
Change-Id: Id6a5aafaf2dc04f114d4d89d43446f7bc959c19f
2020-04-25 01:11:25 +00:00
markchien
eb970903c9 Test legacy tether/untether API and onError callback am: a6b3b70278
Change-Id: Ib03358cf9a1b6cdee5e67535d4a6ab45d95e609d
2020-04-25 01:11:22 +00:00
Mark Chien
1f03fbdeed [automerger skipped] Merge changes Ief9c7453,Ifb3a0618 into rvc-dev am: 7c10f3f277 -s ours
am skip reason: Change-Id Ief9c745322e8705c0e50185e749a81c5a9d20743 with SHA-1 0420e692a7 is in history

Change-Id: I7ba9696e197b4c53b7031f3d7d380b44c66cfbac
2020-04-25 01:10:39 +00:00
Treehugger Robot
a332dfe306 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116 am: 482dda22da am: f0d7968e23 am: e14795a77c
Change-Id: I14ec9ea56d5c7c6e035c2cfd11d135a87315b31e
2020-04-24 16:51:33 +00:00
Treehugger Robot
583912e8bf Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3 am: 22da660983 am: 9a30944d71 am: d7a033a9fc
Change-Id: I5d0e8d276e0868e0e529b42611852009320570eb
2020-04-24 16:51:13 +00:00
Treehugger Robot
e14795a77c Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116 am: 482dda22da am: f0d7968e23
Change-Id: I38993a2c78020770a67412fe4768b7da3edc23b1
2020-04-24 16:41:25 +00:00
Treehugger Robot
d7a033a9fc Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3 am: 22da660983 am: 9a30944d71
Change-Id: Ic558978631cac079d31e1890807385f5628aaf2a
2020-04-24 16:40:26 +00:00
Treehugger Robot
f0d7968e23 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116 am: 482dda22da
Change-Id: I55e4cad38245be997a410dc9a3786595abd10676
2020-04-24 16:15:26 +00:00
Treehugger Robot
9a30944d71 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3 am: 22da660983
Change-Id: Ifd3822afc77f71960fc8c72053170c84775279d5
2020-04-24 16:14:34 +00:00
Treehugger Robot
482dda22da Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0 am: 91d915e116
Change-Id: I3aa5fadfb7b417730d53c8976f425e3c229e9918
2020-04-24 16:01:23 +00:00
Treehugger Robot
22da660983 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c am: b8e44e87b3
Change-Id: I8a6b617bd1e43e8689b92c00349bf72e155fd94d
2020-04-24 16:00:43 +00:00
Treehugger Robot
91d915e116 Merge "Add testTetheringUpstream cts test" am: 6aa8f074d0
Change-Id: Ib8ca2e9a3dca0494af62e193f261bf4a943d3028
2020-04-24 15:44:51 +00:00
Treehugger Robot
b8e44e87b3 Merge "Test legacy tether/untether API and onError callback" am: c31694df4c
Change-Id: If9a821510f0e1117faf3d12808753fd3e2535adf
2020-04-24 15:44:37 +00:00
Treehugger Robot
6aa8f074d0 Merge "Add testTetheringUpstream cts test" 2020-04-24 15:36:21 +00:00
Treehugger Robot
c31694df4c Merge "Test legacy tether/untether API and onError callback" 2020-04-24 15:29:44 +00:00
markchien
668dfa5998 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
Merged-In: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:31:01 +08:00
markchien
0420e692a7 Add testTetheringUpstream cts test
If cellular is the mobile network, tethering should select it as
upstream. If DUN is required, tethering should use DUN as its upstream.

Bug: 153614366
Bug: 150644305
Test: atest CtsTetheringTest

Change-Id: Ief9c745322e8705c0e50185e749a81c5a9d20743
2020-04-24 22:29:43 +08:00
markchien
a6b3b70278 Test legacy tether/untether API and onError callback
Test legacy tether/untether API behavior. tether() rely on downstream
setup ready for tethering. Currently the only user is bluetooth
tethering. For other tetherings, there is no guaranteed that calling
tether() can always switch given interface to tethered. Tethering
may callback with onError depend on the interface status. Caller
should use startTethering/stopTethering API instead of these
legacy APIs.

This change also change the precondition verification of startTethering.
If tethering interface got error last time, such interface would not
be reported as tetherable.

Bug: 150632712
Test: atest CtsTetheringTest
Change-Id: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
Merged-In: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 22:23:23 +08:00
markchien
1a54afc5b1 Test legacy tether/untether API and onError callback
Test legacy tether/untether API behavior. tether() rely on downstream
setup ready for tethering. Currently the only user is bluetooth
tethering. For other tetherings, there is no guaranteed that calling
tether() can always switch given interface to tethered. Tethering
may callback with onError depend on the interface status. Caller
should use startTethering/stopTethering API instead of these
legacy APIs.

This change also change the precondition verification of startTethering.
If tethering interface got error last time, such interface would not
be reported as tetherable.

Bug: 150632712
Test: atest CtsTetheringTest
Change-Id: Ifb3a0618208ffd0ff224c60f377036bc22ba0565
2020-04-24 21:16:06 +08:00
TreeHugger Robot
4c50a66e6f [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours am: 8340720e76 -s ours am: 32276ea510 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I8d33406253d1a5515329c8bbfce5f62d42ad3a70
2020-04-24 07:05:04 +00:00
TreeHugger Robot
6161062210 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours am: 4201ba3fa3 -s ours am: 10f877bd35 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: If7b227e418c14f27c27a71e5c70e5f4c49a9b38c
2020-04-24 07:03:38 +00:00
TreeHugger Robot
32276ea510 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours am: 8340720e76 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ic41ea0bfe2208a20c82269f4710bb4a780db1851
2020-04-24 06:57:47 +00:00
TreeHugger Robot
10f877bd35 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours am: 4201ba3fa3 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I68c1a0c75d91eb410e3af59a85fba0ec90525839
2020-04-24 06:57:22 +00:00
TreeHugger Robot
8340720e76 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours am: 38bd84d94e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: I656462f68b3fba1eefdd61ddff1ca4faec05212f
2020-04-24 06:42:28 +00:00
TreeHugger Robot
4201ba3fa3 [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e am: 2eed6ea182 -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: If2e49d8251036dba4decffc2c1631a7171334c95
2020-04-24 06:42:05 +00:00
TreeHugger Robot
2eed6ea182 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e
Change-Id: I68240e77ac0e8a6328cfc92f0a5cd844129ae316
2020-04-24 06:27:50 +00:00
TreeHugger Robot
38bd84d94e [automerger skipped] Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev am: 25cd61eb7e -s ours
am skip reason: Change-Id I8d70565fe3388fd8351002f2ed87c43343879e57 with SHA-1 48e0812796 is in history

Change-Id: Ie70f26552e41ba517d80067fad37cabf1980f5cb
2020-04-24 06:27:15 +00:00
TreeHugger Robot
25cd61eb7e Merge "Move DhcpInfoTest to FrameworksNetCommonTests" into rvc-dev 2020-04-24 06:15:12 +00:00
Sudheer Shanka
a58c05ecb4 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours am: 8451b7d01c -s ours am: 09be86c47f -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I17086c384130cc495e4521c7fc9884af362848d3
2020-04-24 03:33:17 +00:00
Sudheer Shanka
09be86c47f [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours am: 8451b7d01c -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I9f6529bd4b719fdb22f5248280c900e384086743
2020-04-24 03:33:10 +00:00
Sudheer Shanka
8451b7d01c [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours am: f5af3d7527 -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: Ie16e6a712f34ed9f9c30d2c8d0ff4bd49f48a54b
2020-04-24 03:29:05 +00:00
Sudheer Shanka
f5af3d7527 [automerger skipped] Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master am: 4cd0f56bea -s ours
am skip reason: Change-Id I05285811d7131e116d5e1d072137ed2cf9576d05 with SHA-1 643abc73d9 is in history

Change-Id: I7964684d586048225998b2956500b96d8f57988c
2020-04-24 03:15:54 +00:00
Sudheer Shanka
4cd0f56bea Merge changes I05285811,I782f8a06,I7c5bf823,I7bb2a7e4 into stage-aosp-master
* changes:
  Ensure location is enabled before getting SSID.
  Fix a regression in how required properties are collected.
  Fix Error Prone errors
  Reland "Pull service dumps to help debug test failures."
2020-04-24 03:14:17 +00:00
Yan Yan
b6dff21134 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98 am: 986cf9af4e am: b174661034
Change-Id: Ie0d827ce62f0c04ea1b2b333fba2f7de746d2ad7
2020-04-24 01:15:02 +00:00
Yan Yan
b174661034 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98 am: 986cf9af4e
Change-Id: Icc35fc9344853eb0b0e2d1b8fe1d5664ee573ba4
2020-04-24 00:59:00 +00:00
Yan Yan
986cf9af4e Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88 am: f2d50ece98
Change-Id: Ida96e4a0dd074a288b1b44defd18097370d618dc
2020-04-24 00:42:06 +00:00
Yan Yan
f2d50ece98 Merge "Add CTS for EapSessionConfig" am: c7afaba688 am: b15c228d88
Change-Id: I3d2ee1aeba0c8473c71a41f3202da663707724f1
2020-04-24 00:39:39 +00:00
Yan Yan
b15c228d88 Merge "Add CTS for EapSessionConfig" am: c7afaba688
Change-Id: I51e89a5604d78c325a8a985b3144ae49734f9eb3
2020-04-24 00:25:31 +00:00
Yan Yan
c7afaba688 Merge "Add CTS for EapSessionConfig" 2020-04-24 00:00:43 +00:00
Yan Yan
50908b9266 Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b am: 8d5985e738 am: 89a9fa945e am: 38d4245f6b
Change-Id: I82f3aa906217f2f3c5a090741633f796857fc20e
2020-04-23 23:20:51 +00:00
Yan Yan
52716ec0e6 Merge "Make a copy of TunUtils and PacketUtils" am: dbe2adf308 am: 755a4b59b7 am: 1020e90c9a am: ce75b8aba4 am: e629ac5127
Change-Id: I785c941eaf3050d24119691349be96339e1a0225
2020-04-23 23:20:28 +00:00
Yan Yan
38d4245f6b Merge "Create base class that sets up test network" am: c921e5075f am: a1c71f705b am: 8d5985e738 am: 89a9fa945e
Change-Id: I0b9fa1a7c70f28e681b1f5942d3e1726a4639fd5
2020-04-23 23:18:32 +00:00