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

Commit 41efd876 authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Ignore updateCarrierService request with invalid phoneId" am:... 

Merge "Ignore updateCarrierService request with invalid phoneId" am: 712c2169 am: a91ad67c am: bb05e45c

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1763682

Change-Id: I0aa03c47f9857080bf488c504ffad4576b55adbf
parents a8673d30 bb05e45c

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+4 −0
Original line number Diff line number Diff line
@@ -597,6 +597,10 @@ public class SubscriptionInfoUpdater extends Handler { 
    }



    private void updateCarrierServices(int phoneId, String simState) {

        if (!SubscriptionManager.isValidPhoneId(phoneId)) {

            logd("Ignore updateCarrierServices request with invalid phoneId " + phoneId);

            return;

        }

        CarrierConfigManager configManager =

                (CarrierConfigManager) sContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        configManager.updateConfigForPhoneId(phoneId, simState);