diff options
| author | Xin Li <delphij@google.com> | 2020-06-06 01:41:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-06-06 01:41:25 +0000 |
| commit | 75acba49ec2f1f1a08f1de96d8842c43986935ee (patch) | |
| tree | 57fcd5f70acb28c1c95d1a37d0ad12c0ccc75d52 | |
| parent | 8c470698294b6a7e8e97c3b28abec91ce04d05c2 (diff) | |
| parent | ef626098ac8b70be3c5709841af706e596c5363f (diff) | |
| download | gps-75acba49ec2f1f1a08f1de96d8842c43986935ee.tar.gz | |
Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2
| -rw-r--r-- | msm8998/android/Gnss.cpp | 7 | ||||
| -rw-r--r-- | msm8998/gnss/GnssAdapter.cpp | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/msm8998/android/Gnss.cpp b/msm8998/android/Gnss.cpp index 9b2e7dd..3389555 100644 --- a/msm8998/android/Gnss.cpp +++ b/msm8998/android/Gnss.cpp @@ -241,14 +241,7 @@ Return<bool> Gnss::injectLocation(double latitudeDegrees, Return<bool> Gnss::injectTime(int64_t timeMs, int64_t timeReferenceMs, int32_t uncertaintyMs) { - ENTRY_LOG_CALLFLOW(); - GnssInterface* gnssInterface = getGnssInterface(); - if (nullptr != gnssInterface) { - gnssInterface->injectTime(timeMs, timeReferenceMs, uncertaintyMs); return true; - } else { - return false; - } } Return<void> Gnss::deleteAidingData(IGnss::GnssAidingData aidingDataFlags) { 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); |