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

Commit 259287c3 authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge "expose carrier id APIs and internal cleanup"

parents f14e4f56 e6aee44a

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

+1 −4
Original line number Diff line number Diff line
@@ -375,7 +375,6 @@ public class CarrierResolver extends Handler { 
                    .ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);

            intent.putExtra(TelephonyManager.EXTRA_CARRIER_ID, mCarrierId);

            intent.putExtra(TelephonyManager.EXTRA_CARRIER_NAME, mCarrierName);

            intent.putExtra(TelephonyManager.EXTRA_MNO_CARRIER_ID, mMnoCarrierId);

            intent.putExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID, mPhone.getSubId());

            mContext.sendBroadcast(intent);
@@ -383,10 +382,8 @@ public class CarrierResolver extends Handler { 
            ContentValues cv = new ContentValues();

            cv.put(CarrierId.CARRIER_ID, mCarrierId);

            cv.put(CarrierId.CARRIER_NAME, mCarrierName);

            cv.put(CarrierId.MNO_CARRIER_ID, mMnoCarrierId);

            mContext.getContentResolver().update(

                    Uri.withAppendedPath(CarrierId.CONTENT_URI,

                            Integer.toString(mPhone.getSubId())), cv, null, null);

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

        }



        update = false;