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

Commit 9db6d3cf authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "only persist carrier id to simInfo db when subId is valid" 

am: cf65a3bb

Change-Id: I689ce524ef819a6c904d28f33224ec936aca6379
parents 9b4a54c0 cf65a3bb

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

+4 −1
Original line number Diff line number Diff line
@@ -384,8 +384,11 @@ public class CarrierResolver extends Handler { 
            cv.put(CarrierId.CARRIER_NAME, mCarrierName);

            mContext.getContentResolver().update(

                    Telephony.CarrierId.getUriForSubscriptionId(mPhone.getSubId()), cv, null, null);

            if (SubscriptionManager.isValidSubscriptionId(mPhone.getSubId())) {

                // only persist carrier id to simInfo db when subId is valid.

                SubscriptionController.getInstance().setCarrierId(mCarrierId, mPhone.getSubId());

            }

        }



        update = false;

        if (preciseCarrierId != mPreciseCarrierId) {