Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70cd747a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB] Fix null carrier config during dump. 

It's theoretically possible for a carrier config to be removed while
`CarrierConfigRepositoryImpl` is being dumped, so protect against that
case by checking if the config is null before dumping it.

Fixes: 386884215
Flag: EXEMPT bugfix
Test: atest CarrierConfigRepositoryImplTest
Change-Id: I3285e0c10e5ac806dc08d587415ba08294bdf071
parent d0b8249b

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryImpl.kt

+6 −1
Original line number Diff line number Diff line
@@ -107,7 +107,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:")