diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-17 07:24:00 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-17 07:24:00 +0000 |
commit | 6b6c02cd2d6eef0c366f33535fd4c14992b504ef (patch) | |
tree | 5734ae854fd91754010dbf62d1e12f7ebfeca4c6 | |
parent | 78d171539af2c2c4a45b077290f594b9a1b72615 (diff) | |
parent | 15e945976b2d8a7047c2a8b87fd639c97423cf51 (diff) | |
download | android_hardware_interfaces-6b6c02cd2d6eef0c366f33535fd4c14992b504ef.tar.gz android_hardware_interfaces-6b6c02cd2d6eef0c366f33535fd4c14992b504ef.tar.bz2 android_hardware_interfaces-6b6c02cd2d6eef0c366f33535fd4c14992b504ef.zip |
Snap for 4399693 from 15e945976b2d8a7047c2a8b87fd639c97423cf51 to oc-mr1-release
Change-Id: Icf8e4608c71a03f30cf0a2ae4fd9524bfacc8c73
-rw-r--r-- | tetheroffload/control/1.0/vts/functional/VtsHalTetheroffloadControlV1_0TargetTest.cpp | 9 |
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 52dd026a8..c009af5d9 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); |