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

Commit 93241d0c authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Do not overwrite isEmbedded" am: b231b210 

am: 589466f0

Change-Id: I9001de3a77a25073b994d3de96abbddb5a624daa
parents a93a3f26 589466f0

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -558,10 +558,7 @@ public class SubscriptionInfoUpdater extends Handler { 
                String msisdn = TelephonyManager.getDefault().getLine1Number(

                String msisdn = TelephonyManager.getDefault().getLine1Number(

                        temp.getSubscriptionId());

                        temp.getSubscriptionId());





                UiccSlot uiccSlot = UiccController.getInstance().getUiccSlotForPhone(slotIndex);

                if (!TextUtils.equals(msisdn, temp.getNumber())) {

                boolean isEuicc = (uiccSlot != null && uiccSlot.isEuicc());

                if (isEuicc != temp.isEmbedded() || !TextUtils.equals(msisdn, temp.getNumber())) {

                    value.put(SubscriptionManager.IS_EMBEDDED, isEuicc);

                    value.put(SubscriptionManager.NUMBER, msisdn);

                    value.put(SubscriptionManager.NUMBER, msisdn);

                    mContext.getContentResolver().update(SubscriptionManager.getUriForSubscriptionId(

                    mContext.getContentResolver().update(SubscriptionManager.getUriForSubscriptionId(

                            temp.getSubscriptionId()), value, null, null);

                            temp.getSubscriptionId()), value, null, null);