diff options
| author | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 22:15:58 -0600 |
|---|---|---|
| committer | Kevin F. Haggerty <haggertk@lineageos.org> | 2020-06-01 22:15:58 -0600 |
| commit | f094c78d973fa3ca104462013d4789951971a187 (patch) | |
| tree | ad4938f632d9947a20475742d5826f241dda8d81 | |
| parent | 553352f3f5802076897e8b5567dcddaa5cb017c0 (diff) | |
| parent | 1e69f401197430bec213211c8a4ee5e7aaf6582b (diff) | |
| download | android_hardware_qcom_gps-lineage-17.1.tar.gz android_hardware_qcom_gps-lineage-17.1.tar.bz2 android_hardware_qcom_gps-lineage-17.1.zip | |
Merge tag 'android-10.0.0_r37' into staging/lineage-17.1_merge-android-10.0.0_r37lineage-17.1
Android 10.0.0 Release 37 (QQ3A.200605.001)
* tag 'android-10.0.0_r37':
[DO NOT MERGE] Comment out LPP in HAL
HIDL API impl can not return false
stub out injectTime API as we should not handle that
Change-Id: I11ed19a6e609532a0b2e6b84c1407755973e38cd
| -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); |