Fix flawed logic for environment aiding feature

Environment aiding has to be injected only when
SAP is PREMIUM_ENV_AIDING. The logic to determine
this is flawed.

CRs-fixed: 2762826

Change-Id: I4b994de4e954f30ecb663858070b93019b85ad4c

1 files changed, 4 insertions, 3 deletions

diff --git a/core/ContextBase.cpp b/core/ContextBase.cpp
index 9cf3828..411c990 100644
--- a/core/ContextBase.cpp
+++ b/core/ContextBase.cpp
@@ -338,7 +338,7 @@ void ContextBase::setEngineCapabilities(uint64_t supportedMsgMask,
             static uint8_t isSapModeKnown = 0;
 
             if (!isSapModeKnown) {
-                /* Check if SAP is PREMIUM_ENV_AIDING in sap.conf */
+                /* Check if SAP is PREMIUM_ENV_AIDING in izat.conf */
                 char conf_feature_sap[LOC_MAX_PARAM_STRING];
                 loc_param_s_type izat_conf_feature_table[] =
                 {
@@ -352,8 +352,9 @@ void ContextBase::setEngineCapabilities(uint64_t supportedMsgMask,
                     uint8_t bitPos = LOC_SUPPORTED_FEATURE_MEASUREMENTS_CORRECTION & 7;
 
                     if (arrayIndex < MAX_FEATURE_LENGTH) {
-                        ContextBase::sFeaturesSupported[arrayIndex] &=
-                            ~(ContextBase::sFeaturesSupported[arrayIndex] >> bitPos);
+                        /* To disable the feature we need to reset the bit on the "bitPos"
+                           position, so shift a "1" to the left by "bitPos" */
+                        ContextBase::sFeaturesSupported[arrayIndex] &= ~(1 << bitPos);
                     }
                 }
             }