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

Commit 282b448f authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

Merge "Do not update display name from SubscriptionInfoUpdater."

parents f82d0598 1f1a82c6

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

+0 −16
Original line number Diff line number Diff line
@@ -446,22 +446,6 @@ public class SubscriptionInfoUpdater extends Handler { 
                    SubscriptionController.getInstance().setAssociatedPlmns(ehplmns, hplmns, subId);

                }



                SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);

                String nameToSet;

                String simCarrierName = tm.getSimOperatorName(subId);



                if (subInfo != null && subInfo.getNameSource() !=

                        SubscriptionManager.NAME_SOURCE_USER_INPUT) {

                    if (!TextUtils.isEmpty(simCarrierName)) {

                        nameToSet = simCarrierName;

                    } else {

                        nameToSet = "CARD " + Integer.toString(slotId + 1);

                    }

                    logd("sim name = " + nameToSet);

                    SubscriptionController.getInstance().setDisplayNameUsingSrc(nameToSet, subId,

                            SubscriptionManager.NAME_SOURCE_DEFAULT_SOURCE);

                }



                /* Update preferred network type and network selection mode on SIM change.

                 * Storing last subId in SharedPreference for now to detect SIM change.

                 */