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

Commit 541ea0d5 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Fix NPE during partial telephony stack boot 

Bug: 331855229
Bug: 344261877
Test: boot cf_x86_64_auto-trunk_staging-userdebug
Change-Id: I7ce7bdc638e9ef6f6059952611cf3f716c358eed
parent 2e2afeeb

src/java/com/android/internal/telephony/uicc/PinStorage.java

+5 −3
Original line number Diff line number Diff line
@@ -193,9 +193,11 @@ public class PinStorage extends Handler { 


        CarrierConfigManager ccm = mContext.getSystemService(CarrierConfigManager.class);

        // Callback directly handle config change and should be executed in handler thread

        if (ccm != null) {

            ccm.registerCarrierConfigChangeListener(this::post,

                    (slotIndex, subId, carrierId, specificCarrierId) ->

                            onCarrierConfigurationChanged(slotIndex));

        }



        // Initialize the long term secret key. This needs to be present in all cases:

        //  - if the device is not secure or is locked: key does not require user authentication