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

Commit 04013b0e authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "When SIM Name save as empty string by user, save the default display name show SIM1/SIM2." 

am: 5f9928e6

Change-Id: Iabc7e680d1abe32bc07c1aa3cb64d66170505f1b
parents ae6868fd 5f9928e6

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

+10 −2
Original line number Diff line number Diff line
@@ -1584,8 +1584,16 @@ public class SubscriptionController extends ISub.Stub { 
                }

            }

            String nameToSet;

            if (displayName == null) {

            if (TextUtils.isEmpty(displayName) || displayName.trim().length() == 0) {

                nameToSet = mTelephonyManager.getSimOperatorName(subId);

                if (TextUtils.isEmpty(nameToSet)) {

                    if (nameSource == SubscriptionManager.NAME_SOURCE_USER_INPUT

                            && SubscriptionManager.isValidSlotIndex(getSlotIndex(subId))) {

                        nameToSet = "CARD " + (getSlotIndex(subId) + 1);

                    } else {

                        nameToSet = mContext.getString(SubscriptionManager.DEFAULT_NAME_RES);

                    }

                }

            } else {

                nameToSet = displayName;

            }