MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gps.conf capabilities overwrited by carrier

Browse source 
If overwrite happened, loc config update will
restore gps.conf capabilities based on target type.

Change-Id: I958ce8da0e8062549f12808aca4aebcf4a7fb95d
CRs-Fixed: 850144
This commit is contained in:
Qiang Chen 2015-06-08 13:01:43 -07:00
parent 9eb36c357a
commit a26bc76b9c
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
loc_api/libloc_api_50001/loc.cpp
View file

@ -202,7 +202,7 @@ static const GnssConfigurationInterface sLocEngConfigInterface =
static loc_eng_data_s_type loc_afw_data; static loc_eng_data_s_type loc_afw_data;
static int gss_fd = -1; static int gss_fd = -1;
static int sGnssType = GNSS_UNKNOWN;
/*=========================================================================== /*===========================================================================
FUNCTION gps_get_hardware_interface FUNCTION gps_get_hardware_interface
@ -254,8 +254,8 @@ extern "C" const GpsInterface* get_gps_interface()
target = loc_get_target(); target = loc_get_target();
LOC_LOGD("Target name check returned %s", loc_get_target_name(target)); LOC_LOGD("Target name check returned %s", loc_get_target_name(target));
int gnssType = getTargetGnssType(target); sGnssType = getTargetGnssType(target);
switch (gnssType) switch (sGnssType)
{ {
case GNSS_GSS: case GNSS_GSS:
case GNSS_AUTO: case GNSS_AUTO:
@ -1147,6 +1147,15 @@ static void loc_configuration_update(const char* config_data, int32_t length)
{ {
ENTRY_LOG(); ENTRY_LOG();
loc_eng_configuration_update(loc_afw_data, config_data, length); loc_eng_configuration_update(loc_afw_data, config_data, length);
switch (sGnssType)
{
case GNSS_GSS:
case GNSS_AUTO:
case GNSS_QCA1530:
//APQ
gps_conf.CAPABILITIES &= ~(GPS_CAPABILITY_MSA | GPS_CAPABILITY_MSB);
break;
}
EXIT_LOG(%s, VOID_RET); EXIT_LOG(%s, VOID_RET);
} }

18
loc_api/libloc_api_50001/loc_eng.cpp
View file

@ -2052,14 +2052,12 @@ int loc_eng_set_position_mode(loc_eng_data_s_type &loc_eng_data,
ENTRY_LOG_CALLFLOW(); ENTRY_LOG_CALLFLOW();
INIT_CHECK(loc_eng_data.adapter, return -1); INIT_CHECK(loc_eng_data.adapter, return -1);
int gnssType = getTargetGnssType(loc_get_target()); // The position mode for AUTO/GSS/QCA1530 can only be standalone
if (!(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSB) &&
// The position mode for GSS/QCA1530 can only be standalone !(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSA) &&
bool is1530 = gnssType == GNSS_QCA1530; (params.mode != LOC_POSITION_MODE_STANDALONE)) {
bool isAPQ = gnssType == GNSS_GSS;
if ((isAPQ || is1530) && params.mode != LOC_POSITION_MODE_STANDALONE) {
params.mode = LOC_POSITION_MODE_STANDALONE; params.mode = LOC_POSITION_MODE_STANDALONE;
LOC_LOGD("Position mode changed to standalone for target with GSS/qca1530."); LOC_LOGD("Position mode changed to standalone for target with AUTO/GSS/qca1530.");
} }
if(! loc_eng_data.adapter->getUlpProxy()->sendFixMode(params)) if(! loc_eng_data.adapter->getUlpProxy()->sendFixMode(params))
@ -2331,10 +2329,8 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call
AGPS_TYPE_WIFI, AGPS_TYPE_WIFI,
true); true);
int gnssType = getTargetGnssType(loc_get_target()); if ((gps_conf.CAPABILITIES & GPS_CAPABILITY_MSA) ||
bool isAPQ = (gnssType == GNSS_GSS); (gps_conf.CAPABILITIES & GPS_CAPABILITY_MSB)) {
bool is1530 = (gnssType == GNSS_QCA1530);
if (!isAPQ && !is1530) {
loc_eng_data.agnss_nif = new AgpsStateMachine(servicerTypeAgps, loc_eng_data.agnss_nif = new AgpsStateMachine(servicerTypeAgps,
(void *)loc_eng_data.agps_status_cb, (void *)loc_eng_data.agps_status_cb,
AGPS_TYPE_SUPL, AGPS_TYPE_SUPL,