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

Commit 9df0f15b authored by chen xu's avatar chen xu
Browse files

only persist carrier id to simInfo db when subId is valid 

sim absent will also cause carrier id update. in that scenario
we shouldn't try to update siminfo db.

Bug: 121350133
Test: Manual
Change-Id: I684e948b447721fe105d4eb75fa7ac1e2cd6c59d
parent 0b4cac5b

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) {