summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Lin <waynewhlin@google.com>2020-02-10 02:16:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-02-10 02:16:21 +0000
commit8b93a4a8f4621bbc8ca025ce2a79326a28497b30 (patch)
tree083daddc68dce1251ce9ccc952baa9414aeda317
parente94011d3da8c8c559c11ccc6094a2363459d4eba (diff)
parent002ed43674cfcabddf00d75e8e923a56a13dd256 (diff)
downloadgps-8b93a4a8f4621bbc8ca025ce2a79326a28497b30.tar.gz
Merge "[DO NOT MERGE] Comment out LPP in HAL" into qt-qpr1-dev
-rw-r--r--msm8998/gnss/GnssAdapter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/msm8998/gnss/GnssAdapter.cpp b/msm8998/gnss/GnssAdapter.cpp
index fadf350..4de1129 100644
--- a/msm8998/gnss/GnssAdapter.cpp
+++ b/msm8998/gnss/GnssAdapter.cpp
@@ -509,7 +509,6 @@ GnssAdapter::setConfigCommand()
inline virtual void proc() const {
LocDualContext::injectFeatureConfig(mAdapter.getContext());
mApi.setSUPLVersion(mAdapter.convertSuplVersion(ContextBase::mGps_conf.SUPL_VER));
- mApi.setLPPConfig(mAdapter.convertLppProfile(ContextBase::mGps_conf.LPP_PROFILE));
mApi.setSensorControlConfig(ContextBase::mSap_conf.SENSOR_USAGE,
ContextBase::mSap_conf.SENSOR_PROVIDER);
mApi.setAGLONASSProtocol(ContextBase::mGps_conf.A_GLONASS_POS_PROTOCOL_SELECT);
@@ -679,6 +678,7 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
errs[index++] = err;
}
}
+ /* Comment out LPP injection as it's configured by MBN.
if (mConfig.flags & GNSS_CONFIG_FLAGS_LPP_PROFILE_VALID_BIT) {
uint32_t newLppProfile = mAdapter.convertLppProfile(mConfig.lppProfile);
if (newLppProfile != ContextBase::mGps_conf.LPP_PROFILE) {
@@ -691,6 +691,7 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
errs[index++] = err;
}
}
+ */
if (mConfig.flags & GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT) {
uint32_t newLppeControlPlaneMask =
mAdapter.convertLppeCp(mConfig.lppeControlPlaneMask);