Merge 8ef6c3cc1aa4d4f32cf24d11d85d6ea2e1eaaed8 on remote branch

Change-Id: I467ec5a84fc2b471d6f68936cec88a44c82b6627

1 files changed, 8 insertions, 2 deletions

diff --git a/core/LocApiBase.h b/core/LocApiBase.h
index b1c3d30..713ca91 100644
--- a/core/LocApiBase.h
+++ b/core/LocApiBase.h
@@ -214,9 +214,15 @@ public:
     virtual void installAGpsCert(const DerEncodedCertificate* pData,
                                  size_t length,
                                  uint32_t slotBitMask);
-    inline virtual void setInSession(bool inSession) {}
+    inline virtual void setInSession(bool inSession) {
+
+        (void)inSession;
+    }
     inline bool isMessageSupported (LocCheckingMessagesID msgID) const {
-        if (msgID > (sizeof(mSupportedMsg) << 3)) {
+
+        // confirm if msgID is not larger than the number of bits in
+        // mSupportedMsg
+        if ((uint64_t)msgID > (sizeof(mSupportedMsg) << 3)) {
             return false;
         } else {
             uint32_t messageChecker = 1 << msgID;