Commit Graph

4744 Commits

Author SHA1 Message Date
Chiachang Wang
4cda12d551 Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf am: b14bd1af58
Change-Id: I064dc2274805291a999ed4d79a218aa0498fcc96
2020-04-20 14:37:33 +00:00
Chiachang Wang
b14bd1af58 Merge "Update network object when wifi meterness is changed" am: db0b1c13e5 am: 7c111f53bf
Change-Id: I7ec9f0b04fa8b5a77cc7856359171134b9ec7e35
2020-04-20 14:13:04 +00:00
Chiachang Wang
7c111f53bf Merge "Update network object when wifi meterness is changed" am: db0b1c13e5
Change-Id: If549b492ef667b833990df7f8935fc9da0220574
2020-04-20 13:56:14 +00:00
Chiachang Wang
db0b1c13e5 Merge "Update network object when wifi meterness is changed" 2020-04-20 13:35:54 +00:00
Chiachang Wang
21ec1de1ff Update network object when wifi meterness is changed
The new wifi disconnect behavior is introduced. When wifi
network is changed from unmetered to metered, the wifi
network will disconnect and reconnect. Update the test to
verify the same SSID wifi is connected and also update the
target network to verfiy the metered preference.

Bug: 153400606
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest\
      #testGetMultipathPreference
Change-Id: Ic298d3d85d8c6b77c8df7614a945f2c22dcdff38
2020-04-20 09:50:17 +08:00
Aaron Huang
89484f7e12 [automerger skipped] Merge "Add test for NetworkRequest#getRequestorUid()" into rvc-dev am: 1abfb9dcc0 -s ours am: ad89deea28 -s ours
am skip reason: Change-Id I9602cac142b3e45d12e66a6f3f35ab594e6590c1 with SHA-1 d1e528ae9c is in history

Change-Id: I4786f07587b5cab3baff09714b1ca21abe685970
2020-04-18 06:00:52 +00:00
Aaron Huang
fead8e14db [automerger skipped] Merge "Add tests for NetworkRequest API" into rvc-dev am: d51549116b -s ours am: 2243ea298b -s ours
am skip reason: Change-Id Id4e31013cfae78c25abd27b557da4e3e9487870c with SHA-1 dacbdaa378 is in history

Change-Id: Iffff2be09f5ec10f755d18b0af5088b36df3107d
2020-04-18 06:00:34 +00:00
Aaron Huang
089a87ddf1 [automerger skipped] Merge "Add test for NetworkRequest#getRequestorUid()" into rvc-dev am: 1abfb9dcc0 am: 3f82dcaf63 -s ours
am skip reason: Change-Id I9602cac142b3e45d12e66a6f3f35ab594e6590c1 with SHA-1 bbc5554392 is in history

Change-Id: I9b0a64101bb22460df1fe60be2515c071d6d5d58
2020-04-18 05:59:15 +00:00
Aaron Huang
fc9a6af655 [automerger skipped] Merge "Add tests for NetworkRequest API" into rvc-dev am: d51549116b am: e34576381e -s ours
am skip reason: Change-Id Id4e31013cfae78c25abd27b557da4e3e9487870c with SHA-1 5585672f92 is in history

Change-Id: I64e7fd9e80d8266a9e869498a0e773e464378b05
2020-04-18 05:59:02 +00:00
Aaron Huang
ad89deea28 [automerger skipped] Merge "Add test for NetworkRequest#getRequestorUid()" into rvc-dev am: 1abfb9dcc0 -s ours
am skip reason: Change-Id I9602cac142b3e45d12e66a6f3f35ab594e6590c1 with SHA-1 bbc5554392 is in history

Change-Id: I261d127ad7b24e59925ceff785243c2323fefa2a
2020-04-18 05:42:40 +00:00
Aaron Huang
2243ea298b [automerger skipped] Merge "Add tests for NetworkRequest API" into rvc-dev am: d51549116b -s ours
am skip reason: Change-Id Id4e31013cfae78c25abd27b557da4e3e9487870c with SHA-1 5585672f92 is in history

Change-Id: I6cf6cc5d2e8883d523d773abc6a1898d1e6a14fb
2020-04-18 05:42:18 +00:00
Aaron Huang
3f82dcaf63 Merge "Add test for NetworkRequest#getRequestorUid()" into rvc-dev am: 1abfb9dcc0
Change-Id: Ic369a1da0d37ca48c28e867dd483da7a35546281
2020-04-18 05:40:55 +00:00
Aaron Huang
e34576381e Merge "Add tests for NetworkRequest API" into rvc-dev am: d51549116b
Change-Id: I4c922114d51d344cfb8f36c02e686c5a0509f43e
2020-04-18 05:40:37 +00:00
Aaron Huang
cf327f705d Merge "Move DhcpInfoTest to FrameworksNetCommonTests" am: 12b24407cf am: 4685ca6b06 am: 02c5d57e96
Change-Id: I86a0e74b11b0e40973d03dde194c02af7fb44d5e
2020-04-17 15:40:15 +00:00
Aaron Huang
02c5d57e96 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" am: 12b24407cf am: 4685ca6b06
Change-Id: Ic293c1af3f90f1e1224fc12289c984786814db80
2020-04-17 15:18:30 +00:00
Aaron Huang
4685ca6b06 Merge "Move DhcpInfoTest to FrameworksNetCommonTests" am: 12b24407cf
Change-Id: I211957f133244246356b7ef043cc001d5bc3a3fb
2020-04-17 14:54:34 +00:00
Aaron Huang
12b24407cf Merge "Move DhcpInfoTest to FrameworksNetCommonTests" 2020-04-17 14:35:41 +00:00
Aaron Huang
d1e528ae9c Add test for NetworkRequest#getRequestorUid()
Add test for new API.

Bug: 151110379
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: I9602cac142b3e45d12e66a6f3f35ab594e6590c1
Merged-In: I9602cac142b3e45d12e66a6f3f35ab594e6590c1
2020-04-17 14:32:26 +00:00
Aaron Huang
dacbdaa378 Add tests for NetworkRequest API
This change inculdes coverage of NetworkRequest#Builder().clearCapabilities()
and NetworkRequest#getRequestorPackageName()

Bug: 153614623
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.NetworkRequestTest
Change-Id: Id4e31013cfae78c25abd27b557da4e3e9487870c
Merged-In: Id4e31013cfae78c25abd27b557da4e3e9487870c
2020-04-17 14:31:31 +00:00
Aaron Huang
48e0812796 Move DhcpInfoTest to FrameworksNetCommonTests
Move to frameworks/base/tests/net/common so that it can
be run in cts test and presubmit test.

Bug: 154299158
Test: atest CtsNetTestCasesLatestSdk:android.net.DhcpInfoTest
Change-Id: I8d70565fe3388fd8351002f2ed87c43343879e57
2020-04-17 17:48:53 +08:00
TreeHugger Robot
ce9c43e64a [automerger skipped] Merge "Add EntitlementResult CTS tests" into rvc-dev am: 301d2c4f10 am: 1d0b35e251 -s ours
am skip reason: Change-Id Icf0d9cacd97eeaa7ceb78f4924c5a6be6e588b30 with SHA-1 8d10ebe3d7 is in history

Change-Id: I4144cf2e6e2b8041e39c60fe46d80dafa1122464
2020-04-17 08:25:11 +00:00
TreeHugger Robot
7730202289 [automerger skipped] Merge "Add EntitlementResult CTS tests" into rvc-dev am: 301d2c4f10 -s ours am: 66f3382a05 -s ours
am skip reason: Change-Id Icf0d9cacd97eeaa7ceb78f4924c5a6be6e588b30 with SHA-1 3936e08f65 is in history

Change-Id: Ie8dcdf91a2d4e08094129987caa6698a9145bd5d
2020-04-17 08:25:05 +00:00
Treehugger Robot
94cf5956f4 [automerger skipped] Add more tests to CtsTetheringTest am: 685f072bfd -s ours am: e040bdb77a -s ours
am skip reason: Change-Id I606097a8db9ed3d2b3eaf933bb1d904e437ab27d with SHA-1 685f072bfd is in history

Change-Id: Ibd122edee2e25276fe3e220befdc153345f6a786
2020-04-17 08:24:59 +00:00
Treehugger Robot
1039c32fb6 [automerger skipped] Add more tests to CtsTetheringTest am: 685f072bfd am: cb64f64d32 -s ours
am skip reason: Change-Id I606097a8db9ed3d2b3eaf933bb1d904e437ab27d with SHA-1 85f0fca1f0 is in history

Change-Id: I9cc682b4913c08d4eaf798aa7dcb47a5a24a9e27
2020-04-17 08:24:38 +00:00
TreeHugger Robot
1d0b35e251 Merge "Add EntitlementResult CTS tests" into rvc-dev am: 301d2c4f10
Change-Id: I22d6a901150e9000bbe431362676a1eb4b5f4a55
2020-04-17 08:11:11 +00:00
TreeHugger Robot
66f3382a05 [automerger skipped] Merge "Add EntitlementResult CTS tests" into rvc-dev am: 301d2c4f10 -s ours
am skip reason: Change-Id Icf0d9cacd97eeaa7ceb78f4924c5a6be6e588b30 with SHA-1 3936e08f65 is in history

Change-Id: I0b8d05d79c6a76f5a275eafa75abbee32f009d13
2020-04-17 08:10:57 +00:00
Treehugger Robot
cb64f64d32 Add more tests to CtsTetheringTest am: 685f072bfd
Change-Id: I64a7759d74d4a2054a816d08ee627c19e0b319c2
2020-04-17 08:10:57 +00:00
Treehugger Robot
e040bdb77a [automerger skipped] Add more tests to CtsTetheringTest am: 685f072bfd -s ours
am skip reason: Change-Id I606097a8db9ed3d2b3eaf933bb1d904e437ab27d with SHA-1 85f0fca1f0 is in history

Change-Id: I5c6c5f8e299b879697ba9a99d96da4bfc0097dc3
2020-04-17 08:10:37 +00:00
TreeHugger Robot
301d2c4f10 Merge "Add EntitlementResult CTS tests" into rvc-dev 2020-04-17 08:02:21 +00:00
Treehugger Robot
685f072bfd Add more tests to CtsTetheringTest
Add TetheringIntegrationTests into CtsTetheringTest

Bug: 148636687
Test: atest CtsTetheringTest
      atest TetheringIntegrationTests
Change-Id: I606097a8db9ed3d2b3eaf933bb1d904e437ab27d
Merged-In: I606097a8db9ed3d2b3eaf933bb1d904e437ab27d
(cherry picked from commit 1f7305c9740a7a1a724c4023f8c55ce827391f73, aosp/1280233)
2020-04-17 07:22:24 +00:00
Treehugger Robot
8d10ebe3d7 Add EntitlementResult CTS tests
Test APIs below:
requestLatestTetheringEntitlementResult(int, boolean,
  java.util.concurrent.Executor,
  android.net.TetheringManager.OnTetheringEntitlementResultListener)
requestLatestTetheringEntitlementResult(int,
  android.os.ResultReceiver, boolean)
OnTetheringEntitlementResultListener.onTetheringEntitlementResult(int)

Bug: 152829363
Test: atests CtsTetheringTest
Change-Id: Icf0d9cacd97eeaa7ceb78f4924c5a6be6e588b30
Merged-In: Icf0d9cacd97eeaa7ceb78f4924c5a6be6e588b30
(cherry picked from commit 4bed8dff67d4a6824098188cd9602668d8705a7e, aosp/1272946)
2020-04-17 07:20:06 +00:00
Aaron Huang
3579004775 Merge changes I9602cac1,Id4e31013 am: c8739d5f10 am: 887ef05bfe am: 201eb700e3
Change-Id: Ic9c281243276dc1ccfbbe6e04af9b918ba574546
2020-04-17 06:10:05 +00:00
Aaron Huang
201eb700e3 Merge changes I9602cac1,Id4e31013 am: c8739d5f10 am: 887ef05bfe
Change-Id: I09607465a4ad73f62365ccfbb80cf5a39a7f876a
2020-04-17 06:00:02 +00:00
Treehugger Robot
112be54123 Merge "Add more tests to CtsTetheringTest" am: d9b892c147 am: 096de769da am: ae32948228
Change-Id: I24e17df9cc36ea705b9a7a85d1d706ba4b78f6fc
2020-04-17 05:45:44 +00:00
Treehugger Robot
acbb68845c Merge "Add EntitlementResult CTS tests" am: e2810722b8 am: 582fabf072 am: 43acf52c77
Change-Id: I3684c03034ac0e2a66a02b596d8c23c48c5b0798
2020-04-17 05:45:26 +00:00
Aaron Huang
887ef05bfe Merge changes I9602cac1,Id4e31013 am: c8739d5f10
Change-Id: I45d5efa13afdc141e0c38c614aae870c565e76bf
2020-04-17 05:37:03 +00:00
Treehugger Robot
ae32948228 Merge "Add more tests to CtsTetheringTest" am: d9b892c147 am: 096de769da
Change-Id: I32a8f7a225f7718c56602061c928685e5657c8b9
2020-04-17 05:31:40 +00:00
Treehugger Robot
43acf52c77 Merge "Add EntitlementResult CTS tests" am: e2810722b8 am: 582fabf072
Change-Id: I520bfc0ad0334d865a6c93b7d3fbad79ce657f79
2020-04-17 05:31:29 +00:00
Aaron Huang
c8739d5f10 Merge changes I9602cac1,Id4e31013
* changes:
  Add test for NetworkRequest#getRequestorUid()
  Add tests for NetworkRequest API
2020-04-17 05:26:03 +00:00
Treehugger Robot
096de769da Merge "Add more tests to CtsTetheringTest" am: d9b892c147
Change-Id: I4f3b42dbcc95b3c6aa167b6ed24d311b70cf77c4
2020-04-17 05:15:56 +00:00
Treehugger Robot
582fabf072 Merge "Add EntitlementResult CTS tests" am: e2810722b8
Change-Id: Iddbde6b69150aa0dd4f2f59e9635adb762f2a1a2
2020-04-17 05:15:41 +00:00
Treehugger Robot
d9b892c147 Merge "Add more tests to CtsTetheringTest" 2020-04-17 05:04:53 +00:00
Automerger Merge Worker
f920900796 Merge changes from topic "am-0e90a053d9f64e61acb611010b330106" into rvc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev am: 6742ce7ab1 am: 3cfc01fe3b -s ours
  [automerger skipped] Test setting proposal, TS and lifetime for ChildSessionParams am: 2b98dce4e9 am: 5ee6a62fd1 -s ours
  [automerger skipped] Add CTS for building IKE and Child SaProposal am: ff7fe1e5fe am: 89bceb8193 -s ours
2020-04-16 18:12:12 +00:00
Yan Yan
c6ff401814 [automerger skipped] Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev am: 6742ce7ab1 am: 3cfc01fe3b -s ours
am skip reason: Change-Id Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c with SHA-1 5e89d115fb is in history

Change-Id: Ie89b60caf76d77fc66fd54f3f169707a3014cd54
2020-04-16 18:12:07 +00:00
Yan Yan
bdcb02601a [automerger skipped] Test setting proposal, TS and lifetime for ChildSessionParams am: 2b98dce4e9 am: 5ee6a62fd1 -s ours
am skip reason: Change-Id If19fb12c92f65d487478fda172acb21f6cfb1717 with SHA-1 6f4d0a0d64 is in history

Change-Id: I974e69baa964ed879dc1f0a8dd18293553b80273
2020-04-16 18:12:05 +00:00
Yan Yan
52d9bd3303 [automerger skipped] Add CTS for building IKE and Child SaProposal am: ff7fe1e5fe am: 89bceb8193 -s ours
am skip reason: Change-Id Ic50d70f35216a065ff398c38262f2de0b370c5ef with SHA-1 848b78d9fb is in history

Change-Id: Ifebf3c38c08d3f25bc3c9fdd6392b7f25645f19d
2020-04-16 18:12:03 +00:00
Yan Yan
47ae8adc3b [automerger skipped] Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev am: 6742ce7ab1 -s ours am: f57f918660 -s ours
am skip reason: Change-Id Ib3e803159cdf42a8655c0e4d0f22faeabe161c4c with SHA-1 cb778b1200 is in history

Change-Id: If9a48cc472787c3c684cbf61ef21a22f1f88cfe7
2020-04-16 18:11:51 +00:00
Yan Yan
3cfc01fe3b Merge changes Ib3e80315,If19fb12c,Ic50d70f3 into rvc-dev am: 6742ce7ab1
Change-Id: I8497fee3b6d1e8d2c39964e6b3efbec4c1961990
2020-04-16 17:52:11 +00:00
Yan Yan
5ee6a62fd1 Test setting proposal, TS and lifetime for ChildSessionParams am: 2b98dce4e9
Change-Id: I0b417ce97eefb404e5bdd5c56f58f379c1167ea2
2020-04-16 17:52:08 +00:00
Yan Yan
89bceb8193 Add CTS for building IKE and Child SaProposal am: ff7fe1e5fe
Change-Id: I3b3ee83a72edf4159931c0c584366d62c04cad46
2020-04-16 17:52:00 +00:00