Merge "Fix ATL handling"

loc_api/libloc_api_50001/loc.cpp

@@ -571,19 +571,7 @@ const void* loc_get_extension(const char* name)
    }
    else if (strcmp(name, AGPS_INTERFACE) == 0)
    {
-       //Return an interface to AGPS only if MSA or MSB capabilities
+       ret_val = &sLocEngAGpsInterface;
-       //are present. If the target is an APQ, these masks are
-       //cleared in get_gps_interface() and the below logic will
-       //return NULL as the interface for AGPS
-       if((gps_conf.CAPABILITIES & GPS_CAPABILITY_MSA) ||
-          (gps_conf.CAPABILITIES & GPS_CAPABILITY_MSB) ) {
-           LOC_LOGD("%s:%d]: AGPS capabilities found\n", __func__, __LINE__);
-           ret_val = &sLocEngAGpsInterface;
-       }
-       else {
-           LOC_LOGD("%s:%d]: Returning NULL AgpsInterface\n", __func__, __LINE__);
-           ret_val = NULL;
-       }
    }
    else if (strcmp(name, GPS_NI_INTERFACE) == 0)
    {

loc_api/libloc_api_50001/loc_eng.cpp

@@ -979,8 +979,10 @@ LocEngSuplEsOpened::LocEngSuplEsOpened(void* locEng) :
 }
 void LocEngSuplEsOpened::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
-    AgpsStateMachine* sm = locEng->ds_nif;
+    if (locEng->ds_nif) {
-    sm->onRsrcEvent(RSRC_GRANTED);
+        AgpsStateMachine* sm = locEng->ds_nif;
+        sm->onRsrcEvent(RSRC_GRANTED);
+    }
 }
 void LocEngSuplEsOpened::locallog() const {
     LOC_LOGV("LocEngSuplEsOpened");
@@ -996,8 +998,10 @@ LocEngSuplEsClosed::LocEngSuplEsClosed(void* locEng) :
 }
 void LocEngSuplEsClosed::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
-    AgpsStateMachine* sm = locEng->ds_nif;
+    if (locEng->ds_nif) {
-    sm->onRsrcEvent(RSRC_RELEASED);
+        AgpsStateMachine* sm = locEng->ds_nif;
+        sm->onRsrcEvent(RSRC_RELEASED);
+    }
 }
 void LocEngSuplEsClosed::locallog() const {
     LOC_LOGV("LocEngSuplEsClosed");
@@ -1014,9 +1018,13 @@ LocEngRequestSuplEs::LocEngRequestSuplEs(void* locEng, int id) :
 }
 void LocEngRequestSuplEs::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
-    AgpsStateMachine* sm = locEng->ds_nif;
+    if (locEng->ds_nif) {
-    DSSubscriber s(sm, mID);
+        AgpsStateMachine* sm = locEng->ds_nif;
-    sm->subscribeRsrc((Subscriber*)&s);
+        DSSubscriber s(sm, mID);
+        sm->subscribeRsrc((Subscriber*)&s);
+    } else {
+        locEng->adapter->atlOpenStatus(mID, 0, NULL, -1, -1);
+    }
 }
 inline void LocEngRequestSuplEs::locallog() const {
     LOC_LOGV("LocEngRequestSuplEs");
@@ -1035,11 +1043,15 @@ void LocEngRequestATL::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
     AgpsStateMachine* sm = (AgpsStateMachine*)
                            getAgpsStateMachine(*locEng, mType);
-    ATLSubscriber s(mID,
+    if (sm) {
-                    sm,
+        ATLSubscriber s(mID,
-                    locEng->adapter,
+                        sm,
-                    AGPS_TYPE_INVALID == mType);
+                        locEng->adapter,
-    sm->subscribeRsrc((Subscriber*)&s);
+                        AGPS_TYPE_INVALID == mType);
+        sm->subscribeRsrc((Subscriber*)&s);
+    } else {
+        locEng->adapter->atlOpenStatus(mID, 0, NULL, -1, mType);
+    }
 }
 inline void LocEngRequestATL::locallog() const {
     LOC_LOGV("LocEngRequestATL");
@@ -1055,28 +1067,38 @@ LocEngReleaseATL::LocEngReleaseATL(void* locEng, int id) :
 }
 void LocEngReleaseATL::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
-    ATLSubscriber s1(mID, locEng->agnss_nif, locEng->adapter, false);
+
-    if (locEng->agnss_nif->unsubscribeRsrc((Subscriber*)&s1)) {
+   if (locEng->agnss_nif) {
-        LOC_LOGD("%s:%d]: Unsubscribed from agnss_nif",
+        ATLSubscriber s1(mID, locEng->agnss_nif, locEng->adapter, false);
-                 __func__, __LINE__);
+        if (locEng->agnss_nif->unsubscribeRsrc((Subscriber*)&s1)) {
-    } else {
+            LOC_LOGD("%s:%d]: Unsubscribed from agnss_nif",
+                     __func__, __LINE__);
+            return;
+        }
+    }
+
+    if (locEng->internet_nif) {
         ATLSubscriber s2(mID, locEng->internet_nif, locEng->adapter, false);
         if (locEng->internet_nif->unsubscribeRsrc((Subscriber*)&s2)) {
             LOC_LOGD("%s:%d]: Unsubscribed from internet_nif",
                      __func__, __LINE__);
-        } else {
+            return;
-            DSSubscriber s3(locEng->ds_nif, mID);
-            if(locEng->ds_nif->unsubscribeRsrc((Subscriber*)&s3)) {
-                LOC_LOGD("%s:%d]: Unsubscribed from ds_nif",
-                         __func__, __LINE__);
-            } else {
-                LOC_LOGW("%s:%d]: Could not release ATL. "
-                         "No subscribers found\n",
-                         __func__, __LINE__);
-                locEng->adapter->atlCloseStatus(mID, 0);
-            }
         }
     }
+
+    if (locEng->ds_nif) {
+        DSSubscriber s3(locEng->ds_nif, mID);
+        if (locEng->ds_nif->unsubscribeRsrc((Subscriber*)&s3)) {
+            LOC_LOGD("%s:%d]: Unsubscribed from ds_nif",
+                     __func__, __LINE__);
+            return;
+        }
+    }
+
+    LOC_LOGW("%s:%d]: Could not release ATL. "
+             "No subscribers found\n",
+             __func__, __LINE__);
+    locEng->adapter->atlCloseStatus(mID, 0);
 }
 inline void LocEngReleaseATL::locallog() const {
     LOC_LOGV("LocEngReleaseATL");
@@ -1110,11 +1132,15 @@ LocEngReqRelWifi::~LocEngReqRelWifi() {
 }
 void LocEngReqRelWifi::proc() const {
     loc_eng_data_s_type* locEng = (loc_eng_data_s_type*)mLocEng;
-    WIFISubscriber s(locEng->wifi_nif, mSSID, mPassword, mSenderId);
+    if (locEng->wifi_nif) {
-    if (mIsReq) {
+        WIFISubscriber s(locEng->wifi_nif, mSSID, mPassword, mSenderId);
-        locEng->wifi_nif->subscribeRsrc((Subscriber*)&s);
+        if (mIsReq) {
+            locEng->wifi_nif->subscribeRsrc((Subscriber*)&s);
+        } else {
+            locEng->wifi_nif->unsubscribeRsrc((Subscriber*)&s);
+        }
     } else {
-        locEng->wifi_nif->unsubscribeRsrc((Subscriber*)&s);
+        locEng->adapter->atlOpenStatus(mSenderId, 0, NULL, -1, mType);
     }
 }
 inline void LocEngReqRelWifi::locallog() const {
@@ -1478,13 +1504,6 @@ int loc_eng_init(loc_eng_data_s_type &loc_eng_data, LocCallbacks* callbacks,
         loc_eng_data.generateNmea = false;
     }
 
-    //Disable AGPS if capabilities are not present
-    if(!(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSA) &&
-       !(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSB)) {
-        event &= ~(LOC_API_ADAPTER_BIT_LOCATION_SERVER_REQUEST |
-                   LOC_API_ADAPTER_BIT_NI_NOTIFY_VERIFY_REQUEST);
-    }
-
     loc_eng_data.adapter =
         new LocEngAdapter(event, &loc_eng_data,
                           (MsgTask::tCreate)callbacks->create_thread_cb);
@@ -1752,6 +1771,13 @@ int loc_eng_set_position_mode(loc_eng_data_s_type &loc_eng_data,
     ENTRY_LOG_CALLFLOW();
     INIT_CHECK(loc_eng_data.adapter, return -1);
 
+    // The position mode for APQ target can only be standalone
+    bool isAPQ = (getTargetGnssType(get_target()) == GNSS_GSS);
+    if (isAPQ && params.mode != LOC_POSITION_MODE_STANDALONE) {
+        params.mode = LOC_POSITION_MODE_STANDALONE;
+        LOC_LOGD("Position mode changed to standalone for APQ target.");
+    }
+
     if(! loc_eng_data.adapter->getUlpProxy()->sendFixMode(params))
     {
         LocEngAdapter* adapter = loc_eng_data.adapter;
@@ -1976,28 +2002,14 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call
     STATE_CHECK((NULL == loc_eng_data.agps_status_cb),
                 "agps instance already initialized",
                 return);
-    if(callbacks == NULL) {
+    if (callbacks == NULL) {
         LOC_LOGE("loc_eng_agps_init: bad parameters cb %p", callbacks);
         EXIT_LOG(%s, VOID_RET);
         return;
     }
-
-    //Proceed to create AGPS framework only if MSA or MSB capabilities
-    //are present. If the target is an APQ, these masks are
-    //cleared in get_gps_interface()
-    if(!(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSA) &&
-       !(gps_conf.CAPABILITIES & GPS_CAPABILITY_MSB) ) {
-        LOC_LOGD("%s:%d]: No AGPS capabilities found. Returning\n",
-                 __func__, __LINE__);
-        return;
-    }
     LocEngAdapter* adapter = loc_eng_data.adapter;
     loc_eng_data.agps_status_cb = callbacks->status_cb;
 
-    loc_eng_data.agnss_nif = new AgpsStateMachine(servicerTypeAgps,
-                                                  (void *)loc_eng_data.agps_status_cb,
-                                                  AGPS_TYPE_SUPL,
-                                                  false);
     loc_eng_data.internet_nif = new AgpsStateMachine(servicerTypeAgps,
                                                      (void *)loc_eng_data.agps_status_cb,
                                                      AGPS_TYPE_WWAN_ANY,
@@ -2006,13 +2018,23 @@ void loc_eng_agps_init(loc_eng_data_s_type &loc_eng_data, AGpsExtCallbacks* call
                                                  (void *)loc_eng_data.agps_status_cb,
                                                  AGPS_TYPE_WIFI,
                                                  true);
-    loc_eng_data.adapter->sendMsg(new LocEngDataClientInit(&loc_eng_data));
 
-    if (adapter->mAgpsEnabled) {
+    bool isAPQ = (getTargetGnssType(get_target()) == GNSS_GSS);
-        loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb,
+    if (!isAPQ) {
-                                               NULL, NULL, &loc_eng_data);
+        loc_eng_data.agnss_nif = new AgpsStateMachine(servicerTypeAgps,
+                                                      (void *)loc_eng_data.agps_status_cb,
+                                                      AGPS_TYPE_SUPL,
+                                                      false);
+
+        loc_eng_data.adapter->sendMsg(new LocEngDataClientInit(&loc_eng_data));
+
+        if (adapter->mAgpsEnabled) {
+            loc_eng_dmn_conn_loc_api_server_launch(callbacks->create_thread_cb,
+                                                   NULL, NULL, &loc_eng_data);
+        }
+        loc_eng_agps_reinit(loc_eng_data);
     }
-    loc_eng_agps_reinit(loc_eng_data);
+
     EXIT_LOG(%s, VOID_RET);
 }
 
@@ -2437,8 +2459,10 @@ void loc_eng_handle_engine_up(loc_eng_data_s_type &loc_eng_data)
     loc_eng_reinit(loc_eng_data);
 
     if (loc_eng_data.agps_status_cb != NULL) {
-        loc_eng_data.agnss_nif->dropAllSubscribers();
+        if (loc_eng_data.agnss_nif)
-        loc_eng_data.internet_nif->dropAllSubscribers();
+            loc_eng_data.agnss_nif->dropAllSubscribers();
+        if (loc_eng_data.internet_nif)
+            loc_eng_data.internet_nif->dropAllSubscribers();
 
         loc_eng_agps_reinit(loc_eng_data);
     }

utils/loc_target.cpp

@@ -58,6 +58,7 @@
 #define GPS_CHECK_NO_GPS_HW 1
 
 static int gss_fd = 0;
+static unsigned int gTarget = TARGET_UNKNOWN;
 
 static int read_a_line(const char * file_path, char * line, int line_size)
 {
@@ -83,7 +84,8 @@ static int read_a_line(const char * file_path, char * line, int line_size)
 
 unsigned int get_target(void)
 {
-    unsigned int target = TARGET_DEFAULT;
+    if (gTarget != TARGET_UNKNOWN)
+        return gTarget;
 
     char hw_platform[]      = "/sys/devices/soc0/hw_platform";
     char id[]               = "/sys/devices/soc0/soc_id";
@@ -111,9 +113,9 @@ unsigned int get_target(void)
     if( !memcmp(baseband, STR_APQ, LENGTH(STR_APQ)) ){
         if( !memcmp(rd_id, MPQ8064_ID_1, LENGTH(MPQ8064_ID_1))
             && IS_STR_END(rd_id[LENGTH(MPQ8064_ID_1)]) )
-            target = TARGET_MPQ;
+            gTarget = TARGET_MPQ;
         else
-            target = TARGET_APQ_SA;
+            gTarget = TARGET_APQ_SA;
     }
     else {
         if( (!memcmp(rd_hw_platform, STR_LIQUID, LENGTH(STR_LIQUID))
@@ -124,13 +126,13 @@ unsigned int get_target(void)
              && IS_STR_END(rd_hw_platform[LENGTH(STR_MTP)]))) {
 
             if (!read_a_line( mdm, rd_mdm, LINE_LEN))
-                target = TARGET_MDM;
+                gTarget = TARGET_MDM;
         }
         else if( (!memcmp(rd_id, MSM8930_ID_1, LENGTH(MSM8930_ID_1))
                    && IS_STR_END(rd_id[LENGTH(MSM8930_ID_1)])) ||
                   (!memcmp(rd_id, MSM8930_ID_2, LENGTH(MSM8930_ID_2))
                    && IS_STR_END(rd_id[LENGTH(MSM8930_ID_2)])) )
-             target = TARGET_MSM_NO_SSC;
+             gTarget = TARGET_MSM_NO_SSC;
     }
-    return target;
+    return gTarget;
 }

utils/loc_target.h

@@ -34,6 +34,7 @@
 #define TARGET_APQ_SA        TARGET_SET(GNSS_GSS, NO_SSC)
 #define TARGET_MPQ           TARGET_SET(GNSS_NONE,NO_SSC)
 #define TARGET_MSM_NO_SSC    TARGET_SET(GNSS_MSM, NO_SSC)
+#define TARGET_UNKNOWN       TARGET_SET(GNSS_UNKNOWN, NO_SSC)
 #define getTargetGnssType(target)  (target>>1)
 
 #ifdef __cplusplus