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

Commit 0ae7acf1 authored by chen xu's avatar chen xu Committed by android-build-merger
Browse files

Merge "update carrier id when esim downloaded" into qt-dev 

am: 0ea02d7f

Change-Id: I3715cd3f07646a2a4fa02fc774c3b856a461b74d
parents 18957140 0ea02d7f

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

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.preference.PreferenceManager; 
import android.provider.Settings;

import android.provider.Settings.Global;

import android.provider.Settings.SettingNotFoundException;

import android.service.carrier.CarrierIdentifier;

import android.service.carrier.CarrierService;

import android.service.euicc.EuiccProfileInfo;

import android.service.euicc.EuiccService;
@@ -728,6 +729,11 @@ public class SubscriptionInfoUpdater extends Handler { 
            values.put(SubscriptionManager.DISPLAY_NAME, embeddedProfile.getNickname());

            values.put(SubscriptionManager.NAME_SOURCE, SubscriptionManager.NAME_SOURCE_USER_INPUT);

            values.put(SubscriptionManager.PROFILE_CLASS, embeddedProfile.getProfileClass());

            CarrierIdentifier cid = embeddedProfile.getCarrierIdentifier();

            if (cid != null) {

                values.put(SubscriptionManager.CARRIER_ID,

                        CarrierResolver.getCarrierIdFromIdentifier(mContext, cid));

            }

            hasChanges = true;

            contentResolver.update(SubscriptionManager.CONTENT_URI, values,

                    SubscriptionManager.ICC_ID + "=\"" + embeddedProfile.getIccid() + "\"", null);