diff options
author | ssaha <ssaha@qti.qualcomm.com> | 2018-05-18 02:10:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-18 02:10:14 -0700 |
commit | 97f14db35c17e2ae0591519099d5ee67e23918e9 (patch) | |
tree | 6abe6701a25898b173e9685ce6fe624e37b87514 | |
parent | 8a33ca28a70cf7f9594553ad2342c997b9a0a4b1 (diff) | |
parent | 0baec72ee58ed4ce18c00b094ea85726d264707d (diff) | |
download | ipacfg-mgr-97f14db35c17e2ae0591519099d5ee67e23918e9.tar.gz |
TetherOffload: Address VTS failure in AdditionalStopsWithInitReturnFalse
am: 0baec72ee5
Change-Id: I73aabfcc325085feb1191de148978f1b1e006c40
-rw-r--r-- | msm8998/hal/src/HAL.cpp | 2 | ||||
-rw-r--r-- | msm8998/ipacm/src/IPACM_OffloadManager.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/msm8998/hal/src/HAL.cpp b/msm8998/hal/src/HAL.cpp index 11dd26d..42fe868 100644 --- a/msm8998/hal/src/HAL.cpp +++ b/msm8998/hal/src/HAL.cpp @@ -408,7 +408,7 @@ Return<void> HAL::setLocalPrefixes fl.addArg("prefixes", prefixesStr); if (!isInitialized()) { - BoolResult res = makeInputCheckFailure("Not initialized"); + res = makeInputCheckFailure("Not initialized"); } else if(prefixesStr.size() < 1) { res = ipaResultToBoolResult(RET::FAIL_INPUT_CHECK); } else if (!parser.add(prefixesStr)) { diff --git a/msm8998/ipacm/src/IPACM_OffloadManager.cpp b/msm8998/ipacm/src/IPACM_OffloadManager.cpp index 4010e72..1645e89 100644 --- a/msm8998/ipacm/src/IPACM_OffloadManager.cpp +++ b/msm8998/ipacm/src/IPACM_OffloadManager.cpp @@ -349,7 +349,15 @@ RET IPACM_OffloadManager::setUpstream(const char *upstream_name, const Prefix& g if(upstream_name == NULL) { if (default_gw_index == INVALID_IFACE) { - IPACMERR("no previous upstream set before\n"); + for (index = 0; index < MAX_EVENT_CACHE; index++) { + if (event_cache[index].valid == true && + event_cache[index].event == IPA_WAN_UPSTREAM_ROUTE_ADD_EVENT) { + event_cache[index].valid = false; + memset(event_cache, 0, MAX_EVENT_CACHE*sizeof(framework_event_cache)); + return SUCCESS; + } + } + IPACMERR("no previous upstream set before\n"); return FAIL_INPUT_CHECK; } if (gw_addr_v4.fam == V4 && upstream_v4_up == true) { |