commit 8014a899a10d2d0003eab1ea88e379b8a89c0058
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 06:05:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 22 06:05:37 2020 +0000
tree 4b3ec90616c7ebd1def4c5b68dc3a1d9c4de725f
parent 6950d3998addf71ab31e1b7f0049c8710975912e
parent 6c0b9e6df7a4fef75a79cd8543474ee954c7e619

[DO NOT MERGE] Comment out LPP in HAL am: 6c0b9e6df7

Change-Id: I0c4b8008a2d9b7d0dc38cd6307325cac002e55e6

sdm845/gnss/GnssAdapter.cpp

diff --git a/sdm845/gnss/GnssAdapter.cpp b/sdm845/gnss/GnssAdapter.cpp
index 04750b6..a404bbb 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);