summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-02-15 02:22:08 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-02-15 02:22:08 +0000
commita1868de3255955edc8c8f913bc6f04af4c3a778a (patch)
tree7dc31be46d66266a615d7c41ec0d0aa7b664b94a
parentbd8a192a7a3c93997146bd2c5d547466da04a1b2 (diff)
parent5b2a2ed82c174b46692a15536e6a19561e3b5f7c (diff)
downloadgps-a1868de3255955edc8c8f913bc6f04af4c3a778a.tar.gz
Snap for 6210291 from 5b2a2ed82c174b46692a15536e6a19561e3b5f7c to qt-d4-release
Change-Id: Ieb2d878af45ce1f4a3fc944bbec80cfb60c02a9d
-rw-r--r--gnss/GnssAdapter.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index b2a7633..d8be31d 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -794,7 +794,6 @@ GnssAdapter::setConfig()
mLocApi->convertLppProfile(gpsConf.LPP_PROFILE);
gnssConfigRequested.aGlonassPositionProtocolMask =
gpsConf.A_GLONASS_POS_PROTOCOL_SELECT;
- /* Let HAL do nothing to LPPe, just set it by MBN
if (gpsConf.LPPE_CP_TECHNOLOGY) {
gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT;
gnssConfigRequested.lppeControlPlaneMask =
@@ -806,7 +805,7 @@ GnssAdapter::setConfig()
gnssConfigRequested.lppeUserPlaneMask =
mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY);
}
- */
+
gnssConfigRequested.blacklistedSvIds.assign(mBlacklistedSvIds.begin(),
mBlacklistedSvIds.end());
mLocApi->sendMsg(new LocApiMsg(
@@ -995,6 +994,7 @@ std::vector<LocationError> GnssAdapter::gnssUpdateConfig(const std::string& oldM
}
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_LPP_PROFILE_VALID_BIT) {
+ /* Let HAL do nothing here, just set it by MBN
if (gnssConfigNeedEngineUpdate.flags &
GNSS_CONFIG_FLAGS_LPP_PROFILE_VALID_BIT) {
err = mLocApi->setLPPConfigSync(gnssConfigRequested.lppProfile);
@@ -1002,10 +1002,12 @@ std::vector<LocationError> GnssAdapter::gnssUpdateConfig(const std::string& oldM
errsList[index] = err;
}
}
+ */
index++;
}
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT) {
+ /* Let HAL do nothing here, just set it by MBN
if (gnssConfigNeedEngineUpdate.flags &
GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT) {
err = mLocApi->setLPPeProtocolCpSync(
@@ -1014,10 +1016,12 @@ std::vector<LocationError> GnssAdapter::gnssUpdateConfig(const std::string& oldM
errsList[index] = err;
}
}
+ */
index++;
}
if (gnssConfigRequested.flags & GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT) {
+ /* Let HAL do nothing here, just set it by MBN
if (gnssConfigNeedEngineUpdate.flags &
GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT) {
err = mLocApi->setLPPeProtocolUpSync(
@@ -1026,6 +1030,7 @@ std::vector<LocationError> GnssAdapter::gnssUpdateConfig(const std::string& oldM
errsList[index] = err;
}
}
+ */
index++;
}