Merge "[SB] Fix null carrier config during dump." into main

1 files changed, 6 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryImpl.kt
index b32037992501..dacb859967e8 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryImpl.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryImpl.kt
@@ -111,7 +111,12 @@ constructor(
             pw.println("Carrier configs by subId")
             configs.keyIterator().forEach {
                 pw.println("  subId=$it")
-                pw.println("    config=${configs.get(it).toStringConsideringDefaults()}")
+                val config = configs.get(it)
+                if (config == null) {
+                    pw.println("    config=null (config was removed during dump)")
+                } else {
+                    pw.println("    config=${config.toStringConsideringDefaults()}")
+                }
             }
             // Finally, print the default config
             pw.println("Default config:")