2f80dcc30c
Handling network types not available in IAgnssRil enums like Bluetooth, Ethernet, Proxy etc. Pass these network type info to framework, rather than sending the default TYPE_UNKNOWN. Change-Id: I7e997b82b07ca68d928bef322182031a2d47e532 CRs-Fixed: 2325210
114 lines
3.8 KiB
C++
114 lines
3.8 KiB
C++
/*
|
|
* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
|
|
* Not a Contribution
|
|
*/
|
|
/*
|
|
* 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.
|
|
*/
|
|
|
|
#define LOG_TAG "LocSvc__AGnssRilInterface"
|
|
|
|
#include <log_util.h>
|
|
#include <dlfcn.h>
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
#include <sstream>
|
|
#include <string>
|
|
#include "Gnss.h"
|
|
#include "AGnssRil.h"
|
|
#include <DataItemConcreteTypesBase.h>
|
|
|
|
typedef void* (getLocationInterface)();
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace gnss {
|
|
namespace V1_1 {
|
|
namespace implementation {
|
|
|
|
|
|
AGnssRil::AGnssRil(Gnss* gnss) : mGnss(gnss) {
|
|
ENTRY_LOG_CALLFLOW();
|
|
}
|
|
|
|
AGnssRil::~AGnssRil() {
|
|
ENTRY_LOG_CALLFLOW();
|
|
}
|
|
|
|
Return<bool> AGnssRil::updateNetworkState(bool connected, NetworkType type, bool /*roaming*/) {
|
|
ENTRY_LOG_CALLFLOW();
|
|
// Extra NetworkTypes not available in IAgnssRil enums
|
|
const int NetworkType_BLUETOOTH = 7;
|
|
const int NetworkType_ETHERNET = 9;
|
|
const int NetworkType_PROXY = 16;
|
|
|
|
// for XTRA
|
|
if (nullptr != mGnss && ( nullptr != mGnss->getGnssInterface() )) {
|
|
int8_t typeout = loc_core::NetworkInfoDataItemBase::TYPE_UNKNOWN;
|
|
switch(type)
|
|
{
|
|
case IAGnssRil::NetworkType::MOBILE:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_MOBILE;
|
|
break;
|
|
case IAGnssRil::NetworkType::WIFI:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_WIFI;
|
|
break;
|
|
case IAGnssRil::NetworkType::MMS:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_MMS;
|
|
break;
|
|
case IAGnssRil::NetworkType::SUPL:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_SUPL;
|
|
break;
|
|
case IAGnssRil::NetworkType::DUN:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_DUN;
|
|
break;
|
|
case IAGnssRil::NetworkType::HIPRI:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_HIPRI;
|
|
break;
|
|
case IAGnssRil::NetworkType::WIMAX:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_WIMAX;
|
|
break;
|
|
default:
|
|
{
|
|
int networkType = (int) type;
|
|
// Handling network types not available in IAgnssRil
|
|
switch(networkType)
|
|
{
|
|
case NetworkType_BLUETOOTH:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_BLUETOOTH;
|
|
break;
|
|
case NetworkType_ETHERNET:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_ETHERNET;
|
|
break;
|
|
case NetworkType_PROXY:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_PROXY;
|
|
break;
|
|
default:
|
|
typeout = loc_core::NetworkInfoDataItemBase::TYPE_UNKNOWN;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
mGnss->getGnssInterface()->updateConnectionStatus(connected, typeout);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V1_1
|
|
} // namespace gnss
|
|
} // namespace hardware
|
|
} // namespace android
|