L3 RRC/NAS developments

src/ue/nas/mm/base.cpp

@@ -470,6 +470,8 @@ void NasMm::onSimRemoval()
 
     m_storage->forbiddenTaiListRoaming->clear();
     m_storage->forbiddenTaiListRps->clear();
+
+    switchMmState(EMmSubState::MM_DEREGISTERED_PS);
 }
 
 } // namespace nr::ue

src/ue/nas/mm/ecall.cpp

@@ -27,6 +27,10 @@ bool NasMm::startECallInactivityIfNeeded()
     if (!m_usim->m_isECallOnly)
         return false;
 
+    // "5.2.2.3.7 The UE camps on a suitable cell or an acceptable cell in a PLMN selected as specified in 3GPP ..."
+    if (!m_base->shCtx.hasActiveCell())
+        return false;
+
     // The procedure shall be started when
     // a) the UE is in any 5GMM-REGISTERED substate except substates 5GMM-REGISTERED.PLMN-SEARCH or
     // 5GMM-REGISTERED.NO-CELL-AVAILABLE;"

src/ue/nas/mm/radio.cpp

@@ -275,6 +275,12 @@ void NasMm::handlePaging(const std::vector<GutiMobileIdentity> &tmsiIds)
     if (!tmsiMatches)
         return;
 
+    if (m_mmSubState == EMmSubState::MM_DEREGISTERED_ECALL_INACTIVE)
+    {
+        m_logger->debug("Ignoring received Paging due to eCall inactive");
+        return;
+    }
+
     m_timers->t3346.stop();
 
     if (m_mmState == EMmState::MM_REGISTERED_INITIATED || m_mmState == EMmState::MM_DEREGISTERED_INITIATED ||

src/ue/types.hpp

@@ -171,6 +171,7 @@ struct UeSharedContext
 
     Plmn getCurrentPlmn();
     Tai getCurrentTai();
+    bool hasActiveCell();
 };
 
 struct TaskBase