32fc12ea4f
Changes in the CL to fix bugs found while integrating with framework: 1. Added IWifiApIface.setCountryCode() Bug: 34682168 2. Fixed documentation nits in .hal files. Bug: 34468218 3. Changed roaming state enum values. Bug: 34715231 4. Added log for EBUSY in legacyErrorToString() Bug: 34715469 5. Remove "-Wno-unused parameter" from Android.mk Bug: 34611289 6. Remove the erroneous |onFailure| callback invocation in wifi.cpp. 7. Add null terminations to strings passed to legacy HAL API's 8. Remove unused |IWifiStaIface.stopDebugPacketFateMonitoring|. Test: Compiles Change-Id: If3a3e2f360a378c59dc56b8bbe3a0c6d400b3bd8
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
/*
|
|
* Copyright (C) 2016 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <android-base/logging.h>
|
|
|
|
#include "hidl_return_util.h"
|
|
#include "wifi_ap_iface.h"
|
|
#include "wifi_status_util.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_0 {
|
|
namespace implementation {
|
|
using hidl_return_util::validateAndCall;
|
|
|
|
WifiApIface::WifiApIface(
|
|
const std::string& ifname,
|
|
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal)
|
|
: ifname_(ifname), legacy_hal_(legacy_hal), is_valid_(true) {}
|
|
|
|
void WifiApIface::invalidate() {
|
|
legacy_hal_.reset();
|
|
is_valid_ = false;
|
|
}
|
|
|
|
bool WifiApIface::isValid() {
|
|
return is_valid_;
|
|
}
|
|
|
|
Return<void> WifiApIface::getName(getName_cb hidl_status_cb) {
|
|
return validateAndCall(this,
|
|
WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
|
|
&WifiApIface::getNameInternal,
|
|
hidl_status_cb);
|
|
}
|
|
|
|
Return<void> WifiApIface::getType(getType_cb hidl_status_cb) {
|
|
return validateAndCall(this,
|
|
WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
|
|
&WifiApIface::getTypeInternal,
|
|
hidl_status_cb);
|
|
}
|
|
|
|
Return<void> WifiApIface::setCountryCode(const hidl_array<int8_t, 2>& code,
|
|
setCountryCode_cb hidl_status_cb) {
|
|
return validateAndCall(this,
|
|
WifiStatusCode::ERROR_WIFI_IFACE_INVALID,
|
|
&WifiApIface::setCountryCodeInternal,
|
|
hidl_status_cb,
|
|
code);
|
|
}
|
|
|
|
std::pair<WifiStatus, std::string> WifiApIface::getNameInternal() {
|
|
return {createWifiStatus(WifiStatusCode::SUCCESS), ifname_};
|
|
}
|
|
|
|
std::pair<WifiStatus, IfaceType> WifiApIface::getTypeInternal() {
|
|
return {createWifiStatus(WifiStatusCode::SUCCESS), IfaceType::AP};
|
|
}
|
|
|
|
WifiStatus WifiApIface::setCountryCodeInternal(
|
|
const std::array<int8_t, 2>& code) {
|
|
legacy_hal::wifi_error legacy_status =
|
|
legacy_hal_.lock()->setCountryCode(code);
|
|
return createWifiStatusFromLegacyError(legacy_status);
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_0
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|