fix: update from upstream

See https://github.com/nrfconnect/sdk-nrf/tree/0c04e40a8ce7cdbfafa7a8781b8160fbc0e2d2d9/applications/asset_tracker_v2

Author: GitHub Actions

src/modules/cloud_module.c

@@ -246,11 +246,21 @@ static void agps_data_handle(const uint8_t *buf, size_t len)
 		LOG_WRN("Unable to process A-GPS data, error: %d", err);
 	} else {
 		LOG_DBG("A-GPS data processed");
-		return;
 	}
 #endif
 
 #if defined(CONFIG_NRF_CLOUD_PGPS)
+#if defined(CONFIG_NRF_CLOUD_AGPS)
+	if (!err) {
+		err = nrf_cloud_pgps_notify_prediction();
+		if (err) {
+			LOG_ERR("Error requesting prediction notification: %d", err);
+		} else {
+			return;
+		}
+	}
+#endif
+
 	LOG_DBG("Process incoming data if P-GPS related");
 
 	err = nrf_cloud_pgps_process(buf, len);
@@ -638,6 +648,10 @@ void pgps_handler(struct nrf_cloud_pgps_event *event)
 			LOG_ERR("Unable to send prediction to modem: %d", err);
 		}
 
+		err = nrf_cloud_pgps_preemptive_updates();
+		if (err) {
+			LOG_ERR("Error requesting updates: %d", err);
+		}
 		break;
 	case PGPS_EVT_REQUEST: {
 		LOG_DBG("PGPS_EVT_REQUEST");

src/modules/data_module.c

@@ -979,31 +979,48 @@ static void agps_request_handle(struct nrf_modem_gnss_agps_data_frame *incoming_
 {
 	int err;
 
+#if defined(CONFIG_NRF_CLOUD_AGPS)
+	struct nrf_modem_gnss_agps_data_frame request;
+
+#if defined(CONFIG_NRF_CLOUD_PGPS)
+	request.sv_mask_ephe = 0;
+	request.sv_mask_alm = 0;
+#else
+	request.sv_mask_ephe = incoming_request->sv_mask_ephe;
+	request.sv_mask_alm = incoming_request->sv_mask_alm;
+#endif
+	request.data_flags = incoming_request->data_flags;
+
+#if defined(CONFIG_NRF_CLOUD_MQTT)
 	/* If CONFIG_NRF_CLOUD_MQTT is enabled, the nRF Cloud MQTT transport library will be used
 	 * to send the request.
 	 */
-#if defined(CONFIG_NRF_CLOUD_AGPS) && defined(CONFIG_NRF_CLOUD_MQTT)
-	err = nrf_cloud_agps_request(incoming_request);
+	err = nrf_cloud_agps_request(&request);
 	if (err) {
 		LOG_WRN("Failed to request A-GPS data, error: %d", err);
 		LOG_WRN("This is expected to fail if we are not in a connected state");
 	} else {
-		LOG_DBG("A-GPS request sent");
-		return;
+		if (nrf_cloud_agps_request_in_progress()) {
+			LOG_DBG("A-GPS request sent");
+			return;
+		}
+		LOG_DBG("No A-GPS data requested");
+		/* Continue so P-GPS, if enabled, can be requested. */
 	}
-#elif defined(CONFIG_NRF_CLOUD_AGPS) && !defined(CONFIG_NRF_CLOUD_MQTT)
+#else
 	/* If the nRF Cloud MQTT transport library is not enabled, we will have to create an
 	 * A-GPS request and send out an event containing the request for the cloud module to pick
 	 * up and send to the cloud that is currently used.
 	 */
-	err = agps_request_encode(incoming_request);
+	err = agps_request_encode(&request);
 	if (err) {
 		LOG_WRN("Failed to request A-GPS data, error: %d", err);
 	} else {
 		LOG_DBG("A-GPS request sent");
 		return;
 	}
 #endif
+#endif
 
 #if defined(CONFIG_NRF_CLOUD_PGPS)
 	/* A-GPS data is not expected to be received. Proceed to schedule a callback when