commit 0cb5a72760380b78bd59fa73599f1331f73bbf4a
author Joe Huang <joethhuang@google.com> Tue Nov 19 19:56:22 2019 +0800
committer Joe Huang <joethhuang@google.com> Wed Nov 20 18:41:12 2019 +0800
tree 43e3dba85c7b50f0e8ef8a471ed46c1ae2c14649
parent 02223669f4591a82f8b1b716a6e4123786648e6e

Comment out LPP in HAL

Set LPP only by MBN configs.

Bug: 129305137

Test: Insert several SIMs and check if LPP value is same as MBN value.
Change-Id: Ie12b53d3c224533f2a8a4d9732241a517468b688

sdm845/gnss/GnssAdapter.cpp

diff --git a/sdm845/gnss/GnssAdapter.cpp b/sdm845/gnss/GnssAdapter.cpp
index 846f56d..5411de8 100644
--- a/sdm845/gnss/GnssAdapter.cpp
+++ b/sdm845/gnss/GnssAdapter.cpp
@@ -694,7 +694,7 @@
         inline virtual void proc() const {
             if (ContextBase::mGps_conf.AGPS_CONFIG_INJECT) {
                 mApi.setSUPLVersion(mAdapter.convertSuplVersion(ContextBase::mGps_conf.SUPL_VER));
-                mApi.setLPPConfig(mAdapter.convertLppProfile(ContextBase::mGps_conf.LPP_PROFILE));
+                // mApi.setLPPConfig(mAdapter.convertLppProfile(ContextBase::mGps_conf.LPP_PROFILE));
                 mApi.setAGLONASSProtocol(ContextBase::mGps_conf.A_GLONASS_POS_PROTOCOL_SELECT);
             }
             mAdapter.setSuplHostServer(ContextBase::mGps_conf.SUPL_HOST,
@@ -875,6 +875,8 @@
                     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 &&
@@ -888,6 +890,8 @@
                     errs[index++] = err;
                 }
             }
+            */
+
             if (mConfig.flags & GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT) {
                 uint32_t newLppeControlPlaneMask =
                     mAdapter.convertLppeCp(mConfig.lppeControlPlaneMask);