diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-08-14 20:19:14 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-08-14 20:19:14 +0000 |
| commit | 73fd263ddc9df758a3b1e184df0fb1256da6fbe6 (patch) | |
| tree | 6abe6701a25898b173e9685ce6fe624e37b87514 | |
| parent | 45448505c2ac2f26b3831cc2d6e1ce8e8ab0f481 (diff) | |
| parent | eb2a1bb9f347bcc58edd84d82b09331ed02d7d1d (diff) | |
| download | ipacfg-mgr-73fd263ddc9df758a3b1e184df0fb1256da6fbe6.tar.gz | |
Snap for 4953200 from eb2a1bb9f347bcc58edd84d82b09331ed02d7d1d to sdk-release
Change-Id: Ia137ec212002da8fbf74e3a7461a5f169bb0ad94
| -rw-r--r-- | msm8998/hal/src/HAL.cpp | 8 | ||||
| -rw-r--r-- | msm8998/ipacm/src/IPACM_Main.cpp | 3 | ||||
| -rw-r--r-- | msm8998/ipacm/src/IPACM_OffloadManager.cpp | 12 |
3 files changed, 19 insertions, 4 deletions
diff --git a/msm8998/hal/src/HAL.cpp b/msm8998/hal/src/HAL.cpp index e19a149..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)) { @@ -611,9 +611,11 @@ Return<void> HAL::removeDownstream Return<void> HAL::debug ( - const hidl_handle& fd, + const hidl_handle& handle, const hidl_vec<hidl_string>& /* options */ ) { - mLogs.toFd(fd->data[0]); + if (handle != nullptr && handle->numFds >= 1) { + mLogs.toFd(handle->data[0]); + } return Void(); } /* debug */ diff --git a/msm8998/ipacm/src/IPACM_Main.cpp b/msm8998/ipacm/src/IPACM_Main.cpp index 13cdb51..62dc596 100644 --- a/msm8998/ipacm/src/IPACM_Main.cpp +++ b/msm8998/ipacm/src/IPACM_Main.cpp @@ -694,6 +694,7 @@ void* ipa_driver_msg_notifier(void *param) if (OffloadMng->elrInstance == NULL) { IPACMERR("OffloadMng->elrInstance is NULL, can't forward to framework!\n"); } else { + IPACMERR("calling OffloadMng->elrInstance->onLimitReached \n"); OffloadMng->elrInstance->onLimitReached(); } continue; @@ -703,6 +704,7 @@ void* ipa_driver_msg_notifier(void *param) if (OffloadMng->elrInstance == NULL) { IPACMERR("OffloadMng->elrInstance is NULL, can't forward to framework!\n"); } else { + IPACMERR("calling OffloadMng->elrInstance->onOffloadStopped \n"); OffloadMng->elrInstance->onOffloadStopped(IpaEventRelay::ERROR); } continue; @@ -712,6 +714,7 @@ void* ipa_driver_msg_notifier(void *param) if (OffloadMng->elrInstance == NULL) { IPACMERR("OffloadMng->elrInstance is NULL, can't forward to framework!\n"); } else { + IPACMERR("calling OffloadMng->elrInstance->onOffloadSupportAvailable \n"); OffloadMng->elrInstance->onOffloadSupportAvailable(); } continue; diff --git a/msm8998/ipacm/src/IPACM_OffloadManager.cpp b/msm8998/ipacm/src/IPACM_OffloadManager.cpp index 2061fd2..1645e89 100644 --- a/msm8998/ipacm/src/IPACM_OffloadManager.cpp +++ b/msm8998/ipacm/src/IPACM_OffloadManager.cpp @@ -59,6 +59,8 @@ IPACM_OffloadManager::IPACM_OffloadManager() upstream_v6_up = false; memset(event_cache, 0, MAX_EVENT_CACHE*sizeof(framework_event_cache)); latest_cache_index = 0; + elrInstance = NULL; + touInstance = NULL; return ; } @@ -347,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) { |