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
106 lines
3.5 KiB
C++
106 lines
3.5 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 "wifi_status_util.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace wifi {
|
|
namespace V1_0 {
|
|
namespace implementation {
|
|
|
|
std::string legacyErrorToString(legacy_hal::wifi_error error) {
|
|
switch (error) {
|
|
case legacy_hal::WIFI_SUCCESS:
|
|
return "SUCCESS";
|
|
case legacy_hal::WIFI_ERROR_UNINITIALIZED:
|
|
return "UNINITIALIZED";
|
|
case legacy_hal::WIFI_ERROR_NOT_AVAILABLE:
|
|
return "NOT_AVAILABLE";
|
|
case legacy_hal::WIFI_ERROR_NOT_SUPPORTED:
|
|
return "NOT_SUPPORTED";
|
|
case legacy_hal::WIFI_ERROR_INVALID_ARGS:
|
|
return "INVALID_ARGS";
|
|
case legacy_hal::WIFI_ERROR_INVALID_REQUEST_ID:
|
|
return "INVALID_REQUEST_ID";
|
|
case legacy_hal::WIFI_ERROR_TIMED_OUT:
|
|
return "TIMED_OUT";
|
|
case legacy_hal::WIFI_ERROR_TOO_MANY_REQUESTS:
|
|
return "TOO_MANY_REQUESTS";
|
|
case legacy_hal::WIFI_ERROR_OUT_OF_MEMORY:
|
|
return "OUT_OF_MEMORY";
|
|
case legacy_hal::WIFI_ERROR_BUSY:
|
|
return "BUSY";
|
|
case legacy_hal::WIFI_ERROR_UNKNOWN:
|
|
return "UNKNOWN";
|
|
}
|
|
}
|
|
|
|
WifiStatus createWifiStatus(WifiStatusCode code,
|
|
const std::string& description) {
|
|
return {code, description};
|
|
}
|
|
|
|
WifiStatus createWifiStatus(WifiStatusCode code) {
|
|
return createWifiStatus(code, "");
|
|
}
|
|
|
|
WifiStatus createWifiStatusFromLegacyError(legacy_hal::wifi_error error,
|
|
const std::string& desc) {
|
|
switch (error) {
|
|
case legacy_hal::WIFI_ERROR_UNINITIALIZED:
|
|
case legacy_hal::WIFI_ERROR_NOT_AVAILABLE:
|
|
return createWifiStatus(WifiStatusCode::ERROR_NOT_AVAILABLE, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_NOT_SUPPORTED:
|
|
return createWifiStatus(WifiStatusCode::ERROR_NOT_SUPPORTED, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_INVALID_ARGS:
|
|
case legacy_hal::WIFI_ERROR_INVALID_REQUEST_ID:
|
|
return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_TIMED_OUT:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", timed out");
|
|
|
|
case legacy_hal::WIFI_ERROR_TOO_MANY_REQUESTS:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", too many requests");
|
|
|
|
case legacy_hal::WIFI_ERROR_OUT_OF_MEMORY:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN,
|
|
desc + ", out of memory");
|
|
|
|
case legacy_hal::WIFI_ERROR_BUSY:
|
|
return createWifiStatus(WifiStatusCode::ERROR_BUSY);
|
|
|
|
case legacy_hal::WIFI_ERROR_NONE:
|
|
return createWifiStatus(WifiStatusCode::SUCCESS, desc);
|
|
|
|
case legacy_hal::WIFI_ERROR_UNKNOWN:
|
|
return createWifiStatus(WifiStatusCode::ERROR_UNKNOWN, "unknown");
|
|
}
|
|
}
|
|
|
|
WifiStatus createWifiStatusFromLegacyError(legacy_hal::wifi_error error) {
|
|
return createWifiStatusFromLegacyError(error, "");
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_0
|
|
} // namespace wifi
|
|
} // namespace hardware
|
|
} // namespace android
|