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
67 lines
2 KiB
C++
67 lines
2 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.
|
|
*/
|
|
|
|
#ifndef WIFI_AP_IFACE_H_
|
|
#define WIFI_AP_IFACE_H_
|
|
|
|
#include <android-base/macros.h>
|
|
#include <android/hardware/wifi/1.0/IWifiApIface.h>
|
|
|
|
#include "wifi_legacy_hal.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_0 {
|
|
namespace implementation {
|
|
|
|
/**
|
|
* HIDL interface object used to control a AP Iface instance.
|
|
*/
|
|
class WifiApIface : public IWifiApIface {
|
|
public:
|
|
WifiApIface(const std::string& ifname,
|
|
const std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal);
|
|
// Refer to |WifiChip::invalidate()|.
|
|
void invalidate();
|
|
bool isValid();
|
|
|
|
// HIDL methods exposed.
|
|
Return<void> getName(getName_cb hidl_status_cb) override;
|
|
Return<void> getType(getType_cb hidl_status_cb) override;
|
|
Return<void> setCountryCode(const hidl_array<int8_t, 2>& code,
|
|
setCountryCode_cb hidl_status_cb) override;
|
|
|
|
private:
|
|
// Corresponding worker functions for the HIDL methods.
|
|
std::pair<WifiStatus, std::string> getNameInternal();
|
|
std::pair<WifiStatus, IfaceType> getTypeInternal();
|
|
WifiStatus setCountryCodeInternal(const std::array<int8_t, 2>& code);
|
|
|
|
std::string ifname_;
|
|
std::weak_ptr<legacy_hal::WifiLegacyHal> legacy_hal_;
|
|
bool is_valid_;
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(WifiApIface);
|
|
};
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_0
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|
|
|
|
#endif // WIFI_AP_IFACE_H_
|