summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-10 02:31:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-10 02:31:27 +0000
commitc83a0cc5aeefc5bbe921e7a78f4eceb33824f0e7 (patch)
tree8893d834046417919c634e7ec4c9beeb4af22870
parentd4c3addaeb639ecf2ab482e62c9c63674d934575 (diff)
parent002ed43674cfcabddf00d75e8e923a56a13dd256 (diff)
downloadgps-c83a0cc5aeefc5bbe921e7a78f4eceb33824f0e7.tar.gz
[DO NOT MERGE] Comment out LPP in HAL am: 002ed43674
Change-Id: I8da8163e8b51f959a9a571ea08897b578dc06384
-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);