commit 48dcb5224179a158823f70c7c019a27ca19e870c
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 10 09:59:39 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 10 09:59:39 2018 -0700
tree b7187df29c858646ba8c33a6fb2533d45bc802a3
parent 2a3118c56842a586d56f5041f45b4a632c1254d9
parent 2b252b6f312e7dda7aeae4f70c334b3c266e6e69

Merge "Assure event mask is set properly to get positions"

sdm845/core/LocApiBase.cpp

diff --git a/sdm845/core/LocApiBase.cpp b/sdm845/core/LocApiBase.cpp
index ae074b5..3d129e3 100644
--- a/sdm845/core/LocApiBase.cpp
+++ b/sdm845/core/LocApiBase.cpp
@@ -107,19 +107,16 @@
 
 struct LocOpenMsg : public LocMsg {
     LocApiBase* mLocApi;
-    LOC_API_ADAPTER_EVENT_MASK_T mMask;
-    inline LocOpenMsg(LocApiBase* locApi,
-                      LOC_API_ADAPTER_EVENT_MASK_T mask) :
-        LocMsg(), mLocApi(locApi), mMask(mask)
+    inline LocOpenMsg(LocApiBase* locApi) :
+            LocMsg(), mLocApi(locApi)
     {
         locallog();
     }
     inline virtual void proc() const {
-        mLocApi->open(mMask);
+        mLocApi->open(mLocApi->getEvtMask());
     }
     inline void locallog() const {
-        LOC_LOGV("%s:%d]: LocOpen Mask: %x\n",
-                 __func__, __LINE__, mMask);
+        LOC_LOGv("LocOpen Mask: %" PRIx64 "\n", mLocApi->getEvtMask());
     }
     inline virtual void log() const {
         locallog();
@@ -175,8 +172,7 @@
     for (int i = 0; i < MAX_ADAPTERS && mLocAdapters[i] != adapter; i++) {
         if (mLocAdapters[i] == NULL) {
             mLocAdapters[i] = adapter;
-            mMsgTask->sendMsg(new LocOpenMsg(this,
-                    mMask | adapter->getEvtMask()));
+            mMsgTask->sendMsg(new LocOpenMsg(this));
             break;
         }
     }
@@ -212,7 +208,7 @@
                 close();
             } else {
                 // else we need to remove the bit
-                mMsgTask->sendMsg(new LocOpenMsg(this, getEvtMask()));
+                mMsgTask->sendMsg(new LocOpenMsg(this));
             }
         }
     }