commit bf3d36c771eb254f082d1f1bf953b44e75b060c5
author Bhavna Sharma <sbhavna@codeaurora.org> Fri Jun 21 14:32:15 2019 -0700
committer Bhavna Sharma <sbhavna@codeaurora.org> Tue Sep 10 15:10:19 2019 -0700
tree a180009649999f6dcf90ad194420afa2fad465ce
parent e60e51f520c9958a9c364ae194d07b02052365fd

Selectively send deleteAll command to engines

Modify GNSS interface API's to accept positioning
engine mask to perform deleteAll command on

CRs-Fixed: 2477966

Change-Id: I54a32d76de98ba6bfa88d7fd1925c44b3079af08

android/1.0/location_api/GnssAPIClient.cpp

diff --git a/android/1.0/location_api/GnssAPIClient.cpp b/android/1.0/location_api/GnssAPIClient.cpp
index a36d2b4..b9fe2b2 100644
--- a/android/1.0/location_api/GnssAPIClient.cpp
+++ b/android/1.0/location_api/GnssAPIClient.cpp
@@ -231,6 +231,7 @@
         GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT |
         GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT |
         GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT;
+    data.posEngineMask = STANDARD_POSITIONING_ENGINE;
 
     if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL)
         data.deleteAll = true;

android/1.1/location_api/GnssAPIClient.cpp

diff --git a/android/1.1/location_api/GnssAPIClient.cpp b/android/1.1/location_api/GnssAPIClient.cpp
index 89877e5..9a95fdf 100644
--- a/android/1.1/location_api/GnssAPIClient.cpp
+++ b/android/1.1/location_api/GnssAPIClient.cpp
@@ -231,6 +231,7 @@
         GNSS_AIDING_DATA_SV_TYPE_QZSS_BIT |
         GNSS_AIDING_DATA_SV_TYPE_BEIDOU_BIT |
         GNSS_AIDING_DATA_SV_TYPE_GALILEO_BIT;
+    data.posEngineMask = STANDARD_POSITIONING_ENGINE;
 
     if (aidingDataFlags == IGnss::GnssAidingData::DELETE_ALL)
         data.deleteAll = true;

gnss/GnssAdapter.cpp

diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index 578953d..c2e4a09 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -1816,12 +1816,15 @@
             mSessionId(sessionId),
             mData(data) {}
         inline virtual void proc() const {
-            mAdapter.deleteAidingData(mData, mSessionId);
+            if ((mData.posEngineMask & STANDARD_POSITIONING_ENGINE) != 0) {
+                mAdapter.deleteAidingData(mData, mSessionId);
 
-            SystemStatus* s = mAdapter.getSystemStatus();
-            if ((nullptr != s) && (mData.deleteAll)) {
-                s->setDefaultGnssEngineStates();
+                SystemStatus* s = mAdapter.getSystemStatus();
+                if ((nullptr != s) && (mData.deleteAll)) {
+                    s->setDefaultGnssEngineStates();
+                }
             }
+
             mAdapter.mEngHubProxy->gnssDeleteAidingData(mData);
         }
     };

location/LocationDataTypes.h

diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h
index 27c5157..40b1c73 100644
--- a/location/LocationDataTypes.h
+++ b/location/LocationDataTypes.h
@@ -707,6 +707,7 @@
     bool deleteAll;              // if true, delete all aiding data and ignore other params
     GnssAidingDataSv sv;         // SV specific aiding data
     GnssAidingDataCommon common; // common aiding data
+    PositioningEngineMask posEngineMask; // engines to perform the delete operation on.
 } GnssAidingData;
 
 typedef uint16_t DrCalibrationStatusMask;