summaryrefslogtreecommitdiffstats
path: root/tetheroffload
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2017-10-17 03:31:33 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-17 03:31:33 +0000
commit34eef5832e31e3ea8105ad7eebc8fff8ffae3804 (patch)
treee2e3fa6c6743670c383323cb608e8d192c5676b7 /tetheroffload
parente3d2a9c5c9422884641c9c8b3b31ba752186a4d9 (diff)
parent15e945976b2d8a7047c2a8b87fd639c97423cf51 (diff)
downloadplatform_hardware_interfaces-34eef5832e31e3ea8105ad7eebc8fff8ffae3804.tar.gz
platform_hardware_interfaces-34eef5832e31e3ea8105ad7eebc8fff8ffae3804.tar.bz2
platform_hardware_interfaces-34eef5832e31e3ea8105ad7eebc8fff8ffae3804.zip
tetheroffload VTS: fix stopOffload test conditions
am: 15e945976b Change-Id: Ibbd15fd40a396c9f3162f223d27f540b8527e706
Diffstat (limited to 'tetheroffload')
-rw-r--r--tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
index 52dd026a87..c009af5d91 100644
--- a/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
+++ b/tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp
@@ -231,7 +231,6 @@ TEST_F(OffloadControlHidlTestBase, AdditionalInitsWithoutStopReturnFalse) {
initOffload(false);
initOffload(false);
initOffload(false);
- stopOffload(ExpectBoolean::True); // balance out initOffload(true)
}
// Check that calling stopOffload() without first having called initOffload() returns false.
@@ -244,6 +243,14 @@ TEST_F(OffloadControlHidlTestBase, MultipleStopsWithoutInitReturnFalse) {
// Check that calling stopOffload() after a complete init/stop cycle returns false.
TEST_F(OffloadControlHidlTestBase, AdditionalStopsWithInitReturnFalse) {
initOffload(true);
+ // Call setUpstreamParameters() so that "offload" can be reasonably said
+ // to be both requested and operational.
+ const hidl_string v4Addr("192.0.0.2");
+ const hidl_string v4Gw("192.0.0.1");
+ const vector<hidl_string> v6Gws{hidl_string("fe80::db8:1"), hidl_string("fe80::db8:2")};
+ const Return<void> upstream =
+ control->setUpstreamParameters("rmnet_data0", v4Addr, v4Gw, v6Gws, ASSERT_TRUE_CALLBACK);
+ EXPECT_TRUE(upstream.isOk());
stopOffload(ExpectBoolean::True); // balance out initOffload(true)
stopOffload(ExpectBoolean::False);
stopOffload(ExpectBoolean::False);