Peter Qiu
9600a8ce96
Merge "wifi: fix testWifiManagerActions test failure" into oc-dev
...
am: 3c3054ec78
Change-Id: I67fa37c57437f43b5ceafb41e1ec7d6f5bcbff04
2017-05-04 21:00:47 +00:00
Peter Qiu
af75a22435
wifi: fix testWifiManagerActions test failure
...
WifiManager#pingSupplicant is deprecated and its semantics had changed.
So remove it in testWifiManagerActions to fix the test.
Bug: 37991667
Test: cts-tradefed run cts-dev --module CtsNetTestCases --test
android.net.wifi.cts.WifiManagerTest#testWifiManagerActions
Change-Id: I9b64cb6d03c253f143a78caca72b75678973034b
2017-05-04 11:31:04 -07:00
Sudheer Shanka
d5132c6e6c
Merge "Fix CtsHostsideNetworkTests." into oc-dev
...
am: 569fdfd845
2017-05-02 05:18:28 +00:00
Sudheer Shanka
569fdfd845
Merge "Fix CtsHostsideNetworkTests." into oc-dev
2017-05-02 05:12:53 +00:00
Jeff Sharkey
9d9ceaed90
Merge "wifi: update method name for timestamp related APIs" into oc-dev
...
am: 15f09b5d64
Change-Id: Ib6b3d5d5cc438e342b106f2482bd838af4477b48
2017-05-01 22:08:31 +00:00
Sudheer Shanka
7655b694ec
Fix CtsHostsideNetworkTests.
...
The changes made to ensuring network connectivity on app start
only applies to activities. There is no change in how the services
are handled.
Bug: 27803922
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ib82b07195e395c89701dd525b850c0935d94dfe7
2017-05-01 11:55:53 -07:00
Peter Qiu
7359ffec6e
wifi: update method name for timestamp related APIs
...
Bug: 37514629
Test: build
Change-Id: I090bc8049e534ef8811104f732fa4183ba87603f
2017-05-01 09:37:36 -07:00
Lorenzo Colitti
c440c73ac2
Merge "Update CTS tests to reflect ConnectivityManager API changes." into oc-dev
...
am: 6a25ed09f9
2017-04-28 04:05:08 +00:00
Lorenzo Colitti
6a25ed09f9
Merge "Update CTS tests to reflect ConnectivityManager API changes." into oc-dev
2017-04-28 03:58:10 +00:00
Lorenzo Colitti
b58d8aa66a
Update CTS tests to reflect ConnectivityManager API changes.
...
Bug: 36370941
Test: marlin-eng builds
Change-Id: Icb127e468698711669ecc2c2002ff8add56700e0
2017-04-28 09:34:06 +09:00
Nathan Harold
ed9fcda61c
Merge "Remove IpSecManagerTest" into oc-dev
...
am: d01cb2e802
Change-Id: I8f58ee1ce60c505fb256c4b47a4f8a1d077c50bd
2017-04-26 18:10:34 +00:00
nharold
0548788841
Merge "Remove IpSecManagerTest" am: 55fb32fd9f am: db56f31e31
...
am: 027d1c8557
2017-04-26 17:37:29 +00:00
nharold
027d1c8557
Merge "Remove IpSecManagerTest" am: 55fb32fd9f
...
am: db56f31e31
Change-Id: I30c11a19eb8bc09a2f15d641e8441dc0eac5b81f
2017-04-26 17:29:59 +00:00
Nathan Harold
c75b01f03e
Remove IpSecManagerTest
...
IpSecManager and its associated classes are removed from OC.
They are planned for a future release.
Bug: 37681043
Test: make cts
Change-Id: I2ff911d5c62dbbf9be699330742d041706d9cbc2
Merged-In: I2ff911d5c62dbbf9be699330742d041706d9cbc2
(cherry picked from commit 3a51173a3a762b576dd3c0d29c883e8763a9f95b)
2017-04-25 16:53:33 -07:00
Nathan Harold
18b7c24177
Remove IpSecManagerTest
...
IpSecManager and its associated classes are removed from OC.
They are planned for a future release.
Bug: 37681043
Test: make cts
Change-Id: I2ff911d5c62dbbf9be699330742d041706d9cbc2
2017-04-25 16:33:29 -07:00
Etan Cohen
f3f81f66c2
Merge "[AWARE] Rename destroy() method to close()" into oc-dev
...
am: 6ae63d613c
2017-04-25 03:31:40 +00:00
Etan Cohen
6ae63d613c
Merge "[AWARE] Rename destroy() method to close()" into oc-dev
2017-04-25 03:26:04 +00:00
Etan Cohen
2fa28c39ae
[AWARE] Rename destroy() method to close()
...
Aware classes with destroy() methods (containing resources)
converted to be AutoCloseable. As such the destroy method
was renamed.
Bug: 37514387
Test: unit tests and integration (sl4a) tests passing.
Merged-In: I433d7cf6f4c60bab4230702075ea22b9c56f31af
Change-Id: I433d7cf6f4c60bab4230702075ea22b9c56f31af
2017-04-21 14:05:45 -07:00
Sudheer Shanka
4ae5e1d2a1
Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev
...
am: 6ec7be5f3c
Change-Id: I1fbbb4f651cc227a59d3d19f871ed3b6679e03b0
2017-04-21 02:06:21 +00:00
Sudheer Shanka
99ec4c0d91
Revert "Relax the check of network availability in CtsHostsideNetworkTests."
...
This reverts commit 863ec4b9cb
2017-04-19 17:36:32 +00:00
Nathan Harold
92a7123377
Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
...
am: d017754253
2017-04-19 00:57:01 +00:00
Nathan Harold
d017754253
Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
2017-04-19 00:36:18 +00:00
nharold
33a246829e
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b
...
am: bd6d169a27
2017-04-18 22:10:17 +00:00
nharold
bd6d169a27
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16
...
am: 335800627b
Change-Id: I276c35e350be82b01f68c260a39e7b33bab619c1
2017-04-18 22:00:45 +00:00
nharold
40fe746f16
Merge "Remove DatagramSocket calls from IpSecManagerTest"
2017-04-18 18:35:21 +00:00
Nathan Harold
372975ecb2
Remove DatagramSocket calls from IpSecManagerTest
...
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()
Bug: 37446006
Test: compilation
Merged-In: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
(cherry picked from commit 8e0db4ceaa9b2940942132e452d44cd59ff971e2)
2017-04-17 22:04:36 -07:00
Nathan Harold
f20fc80ba5
Remove DatagramSocket calls from IpSecManagerTest
...
Because the DatagramSocket version of the API is being
hidden, this test is being converted to use the
FileDescriptor version of applyTransportModeTransform()
and removeTransportModeTransform()
Bug: 37446006
Test: compilation
Change-Id: Ida4977a6e7496ce6b4de38bfd48bd6a162cab874
2017-04-17 22:01:26 -07:00
Sudheer Shanka
21ec60f4db
Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
...
am: a61bc6a566
2017-04-18 04:29:27 +00:00
Sudheer Shanka
a61bc6a566
Merge "Skip data saver related tests if the device doesn't support it." into oc-dev
2017-04-18 04:23:20 +00:00
Tina Zhou
e6254e6d0f
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
...
am: ecb7895518
2017-04-17 18:07:17 +00:00
Tina Zhou
36d6165138
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af am: 9d66f94f38
...
am: 02bf062557
2017-04-17 18:02:48 +00:00
Tina Zhou
ecb7895518
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af
...
am: 9d66f94f38
Change-Id: I5e4b1272325ab0f16eb4cfc981b10a05c776a2da
2017-04-17 17:58:56 +00:00
Tina Zhou
02bf062557
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f am: af849f9dc0 am: ba9c18e7af
...
am: 9d66f94f38
Change-Id: I4120d23485f910260b31794894373df52018adaa
2017-04-17 17:58:45 +00:00
Tina Zhou
293d94f734
Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" am: 0a33006809 am: 6012fe12dc
...
am: aeb1d2f1cf
2017-04-17 17:58:21 +00:00
Tina Zhou
aeb1d2f1cf
Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f" am: 0a33006809
...
am: 6012fe12dc
Change-Id: Id80e3f9e8fbb5eceb9a2b3da341f49803795b3e6
2017-04-17 17:53:26 +00:00
Tina Zhou
ba9c18e7af
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f
...
am: af849f9dc0
2017-04-17 17:48:16 +00:00
Tina Zhou
af849f9dc0
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
...
am: 6ee31c8e8f
2017-04-17 17:43:44 +00:00
Android Merger
0a33006809
Merge "Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev am: 6ee31c8e8f"
2017-04-17 17:39:14 +00:00
Tina Zhou
e5e55017fc
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
...
am: 6ee31c8e8f
2017-04-17 17:39:06 +00:00
Tina Zhou
6ee31c8e8f
Merge "[CTS]It should be more reasonable to use setBatterySaverMode API to leave power-save mode instead of plugging in charger for "CtsHostsideNetworkTests" test case." into nougat-mr1-cts-dev
2017-04-17 17:37:29 +00:00
Sudheer Shanka
cfae83193b
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3 -s ours
...
am: 65f950fd9f
2017-04-15 01:06:58 +00:00
Sudheer Shanka
65f950fd9f
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
...
am: 5b87fbabc3 -s ours
Change-Id: Ib84441f7d5d47dd4b8f5a61ae1f679e93aab7438
2017-04-15 01:04:12 +00:00
Sudheer Shanka
b420e267e1
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b am: 5b87fbabc3
...
am: 8d873914a2
2017-04-14 23:01:50 +00:00
Sudheer Shanka
a203e22df8
Merge "Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours" am: 67a8712d22 -s ours am: e9122b9946 -s ours
...
am: 368d667a4b
2017-04-14 23:00:23 +00:00
Nathan Harold
17ffc4867c
Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev
...
am: 9b807d83a4
2017-04-14 20:29:21 +00:00
Nathan Harold
9b807d83a4
Merge "Update IpSecAlgorithm CTS for API compliance changes" into oc-dev
2017-04-14 20:21:19 +00:00
Sudheer Shanka
d99f8e8b16
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2 -s ours
...
am: dc3f163de2
2017-04-14 18:41:26 +00:00
Sudheer Shanka
dc3f163de2
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5
...
am: 4952b4fce2 -s ours
Change-Id: Icdcf777e3873eda4fa552ab6f1791d1ff42ee74d
2017-04-14 18:39:00 +00:00
Sudheer Shanka
e33887ac9b
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-cts-dev am: 43a0aa48b0 -s ours am: 8b0491eb1f am: 8be8d0d6a9 -s ours am: 64c8f23d98 am: a12dbc91c5 am: 4952b4fce2
...
am: 2d01f2a0de
2017-04-14 16:59:39 +00:00
Sudheer Shanka
8d873914a2
Merge "DO NOT MERGE: Skip data saver related tests if the device doesn't support it." into nougat-mr1-cts-dev am: 4b656d1d00 -s ours am: 4ecf9aadc5 am: 24df7fc52b
...
am: 5b87fbabc3
Change-Id: I283e9c5b9b59f4e59da918dd5d0c4bd57ccc265a
2017-04-14 00:57:07 +00:00
