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

Commit 6e1a388e authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Do not allow NPE if CarrierConfigManager service is null. am: 5cf46dc2 am: de4d24b5 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/3122851



Change-Id: Id46b66db4e19605114267d24cdb980436feff934
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc161b66 de4d24b5

src/com/android/server/telecom/CallLogManager.java

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ public final class CallLogManager extends CallsManagerListenerBase { 
        boolean okToLogEmergencyNumber = false;

        CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(

                Context.CARRIER_CONFIG_SERVICE);

        PersistableBundle configBundle = configManager.getConfigForSubId(

                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle));

        PersistableBundle configBundle = (configManager != null) ? configManager.getConfigForSubId(

                mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(accountHandle)) : null;

        if (configBundle != null) {

            okToLogEmergencyNumber = configBundle.getBoolean(

                    CarrierConfigManager.KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL);