Merge ee0fa20a1d35466b22264116eaeb957495ce6667 on remote branchHEADumineko-8350tachibana-8350

Change-Id: Ie3e99d857848862a71a6b35e4293b905b7fd9fd4

2 files changed, 12 insertions, 135 deletions

diff --git a/batching/BatchingAdapter.cpp b/batching/BatchingAdapter.cpp
index 4fdacda..4f1a43c 100644
--- a/batching/BatchingAdapter.cpp
+++ b/batching/BatchingAdapter.cpp
@@ -26,43 +26,6 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
-/*
-Changes from Qualcomm Innovation Center are provided under the following license:
-
-Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 #define LOG_NDEBUG 0
 #define LOG_TAG "LocSvc_BatchingAdapter"
 
@@ -200,41 +163,6 @@ BatchingAdapter::updateClientsEventMask()
 }
 
 void
-BatchingAdapter::handleEngineLockStatusEvent(EngineLockState engineLockState) {
-
-    LOC_LOGD("%s]: Old Engine state %d, New Engine state : %d,", __func__,
-        mLocApi->getEngineLockState(), engineLockState);
-
-    struct MsgEngineLockStateEvent : public LocMsg {
-        BatchingAdapter& mAdapter;
-        EngineLockState mEngineLockState;
-
-        inline MsgEngineLockStateEvent(BatchingAdapter& adapter, EngineLockState engineLockState) :
-            LocMsg(),
-            mAdapter(adapter),
-            mEngineLockState(engineLockState){}
-
-        virtual void proc() const {
-            mAdapter.handleEngineLockStatus(mEngineLockState);
-        }
-    };
-
-    sendMsg(new MsgEngineLockStateEvent(*this, engineLockState));
-}
-
-void
-BatchingAdapter::handleEngineLockStatus(EngineLockState engineLockState) {
-
-    LOC_LOGd("lock state %d, pending msgs %zu", engineLockState, mPendingGnssEnabledMsgs.size());
-    if (ENGINE_LOCK_STATE_ENABLED == engineLockState) {
-        for (auto msg: mPendingGnssEnabledMsgs) {
-            sendMsg(msg);
-        }
-        mPendingGnssEnabledMsgs.clear();
-    }
-}
-
-void
 BatchingAdapter::handleEngineUpEvent()
 {
     struct MsgSSREvent : public LocMsg {
@@ -250,13 +178,11 @@ BatchingAdapter::handleEngineUpEvent()
             mAdapter.broadcastCapabilities(mAdapter.getCapabilities());
             mApi.setBatchSize(mAdapter.getBatchSize());
             mApi.setTripBatchSize(mAdapter.getTripBatchSize());
-            if (ENGINE_LOCK_STATE_ENABLED == mApi.getEngineLockState()) {
-                mAdapter.restartSessions();
-                for (auto msg: mAdapter.mPendingMsgs) {
-                    mAdapter.sendMsg(msg);
-                }
-                mAdapter.mPendingMsgs.clear();
+            mAdapter.restartSessions();
+            for (auto msg: mAdapter.mPendingMsgs) {
+                mAdapter.sendMsg(msg);
             }
+            mAdapter.mPendingMsgs.clear();
         }
     };
 
@@ -428,8 +354,7 @@ BatchingAdapter::startBatchingCommand(
             if (LOCATION_ERROR_SUCCESS == err) {
                 if (mBatchingOptions.batchingMode == BATCHING_MODE_ROUTINE ||
                     mBatchingOptions.batchingMode == BATCHING_MODE_NO_AUTO_REPORT) {
-                    mAdapter.startBatching(
-                            mClient, mSessionId, mBatchingOptions, new MsgStartBatching(*this));
+                    mAdapter.startBatching(mClient, mSessionId, mBatchingOptions);
                 } else if (mBatchingOptions.batchingMode == BATCHING_MODE_TRIP) {
                     mAdapter.startTripBatchingMultiplex(mClient, mSessionId, mBatchingOptions);
                 } else {
@@ -446,7 +371,7 @@ BatchingAdapter::startBatchingCommand(
 
 void
 BatchingAdapter::startBatching(LocationAPI* client, uint32_t sessionId,
-        const BatchingOptions& batchingOptions, LocMsg* pendingMsg)
+        const BatchingOptions& batchingOptions)
 {
     if (batchingOptions.batchingMode != BATCHING_MODE_NO_AUTO_REPORT &&
         0 == autoReportBatchingSessionsCount()) {
@@ -460,9 +385,8 @@ BatchingAdapter::startBatching(LocationAPI* client, uint32_t sessionId,
     saveBatchingSession(client, sessionId, batchingOptions);
     mLocApi->startBatching(sessionId, batchingOptions, getBatchingAccuracy(), getBatchingTimeout(),
             new LocApiResponse(*getContext(),
-            [this, client, sessionId, batchingOptions, pendingMsg] (LocationError err) {
-        if (ENGINE_LOCK_STATE_ENABLED == mLocApi->getEngineLockState() &&
-            LOCATION_ERROR_SUCCESS != err) {
+            [this, client, sessionId, batchingOptions] (LocationError err) {
+        if (LOCATION_ERROR_SUCCESS != err) {
             eraseBatchingSession(client, sessionId);
         }
 
@@ -475,13 +399,6 @@ BatchingAdapter::startBatching(LocationAPI* client, uint32_t sessionId,
                           LOC_REGISTRATION_MASK_DISABLED);
         }
 
-        if (LOCATION_ERROR_GNSS_DISABLED == err && pendingMsg != nullptr) {
-            LOC_LOGd("GNSS_DISABLED, add request to pending queue");
-            mPendingGnssEnabledMsgs.push_back(pendingMsg);
-        } else if (pendingMsg != nullptr) {
-            delete pendingMsg;
-        }
-
         reportResponse(client, err, sessionId);
     }));
 }
@@ -592,8 +509,7 @@ BatchingAdapter::stopBatching(LocationAPI* client, uint32_t sessionId, bool rest
                 new LocApiResponse(*getContext(),
                 [this, client, sessionId, flpOptions, restartNeeded, batchOptions]
                 (LocationError err) {
-            if (ENGINE_LOCK_STATE_ENABLED == mLocApi->getEngineLockState() &&
-                LOCATION_ERROR_SUCCESS != err) {
+            if (LOCATION_ERROR_SUCCESS != err) {
                 saveBatchingSession(client, sessionId, batchOptions);
             } else {
                 // if stopBatching is success, unregister for batch full event if this was the last
@@ -850,8 +766,7 @@ BatchingAdapter::startTripBatchingMultiplex(LocationAPI* client, uint32_t sessio
         mLocApi->startOutdoorTripBatching(batchingOptions.minDistance,
                 batchingOptions.minInterval, getBatchingTimeout(), new LocApiResponse(*getContext(),
                 [this, client, sessionId, batchingOptions] (LocationError err) {
-            if (ENGINE_LOCK_STATE_DISABLED == mLocApi->getEngineLockState() ||
-                err == LOCATION_ERROR_SUCCESS) {
+            if (err == LOCATION_ERROR_SUCCESS) {
                 mOngoingTripDistance = batchingOptions.minDistance;
                 mOngoingTripTBFInterval = batchingOptions.minInterval;
                 LOC_LOGD("%s] New Trip started ...", __func__);
diff --git a/batching/BatchingAdapter.h b/batching/BatchingAdapter.h
index 4580976..66f7c5f 100644
--- a/batching/BatchingAdapter.h
+++ b/batching/BatchingAdapter.h
@@ -26,43 +26,6 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
-/*
-Changes from Qualcomm Innovation Center are provided under the following license:
-
-Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * Neither the name of Qualcomm Innovation Center, Inc. nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
 #ifndef BATCHING_ADAPTER_H
 #define BATCHING_ADAPTER_H
 
@@ -151,7 +114,7 @@ public:
     void eraseBatchingSession(LocationAPI* client, uint32_t sessionId);
     uint32_t autoReportBatchingSessionsCount();
     void startBatching(LocationAPI* client, uint32_t sessionId,
-                       const BatchingOptions& batchingOptions, LocMsg* pendingMsg = nullptr);
+                       const BatchingOptions& batchingOptions);
     void stopBatching(LocationAPI* client, uint32_t sessionId, bool restartNeeded,
                       const BatchingOptions& batchOptions);
     void stopBatching(LocationAPI* client, uint32_t sessionId) {
@@ -160,8 +123,6 @@ public:
     };
 
     /* ==== REPORTS ======================================================================== */
-    virtual void handleEngineLockStatusEvent(EngineLockState engineLockState);
-    void handleEngineLockStatus(EngineLockState engineLockState);
     /* ======== EVENTS ====(Called from QMI Thread)========================================= */
     void reportLocationsEvent(const Location* locations, size_t count,
             BatchingMode batchingMode);
@@ -185,6 +146,7 @@ public:
     uint32_t getBatchingTimeout() { return mBatchingTimeout; }
     void setBatchingAccuracy(uint32_t accuracy) { mBatchingAccuracy = accuracy; }
     uint32_t getBatchingAccuracy() { return mBatchingAccuracy; }
+
 };
 
 #endif /* BATCHING_ADAPTER_H */