Merge "Only config VoNR per carrier config if card is PRESENT" into sc-v2-devandroid12L-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
index a434efe8ac..fff77b6f5f 100644
--- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java
+++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java
@@ -4719,6 +4719,13 @@ public class GsmCdmaPhone extends Phone {
     }
 
     private void updateVoNrSettings(PersistableBundle config) {
+        UiccSlot slot = mUiccController.getUiccSlotForPhone(mPhoneId);
+
+        // If no card is present, do nothing.
+        if (slot == null || slot.getCardState() != IccCardStatus.CardState.CARDSTATE_PRESENT) {
+            return;
+        }
+
         if (config == null) {
             loge("didn't get the vonr_enabled_bool from the carrier config.");
             return;