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

Commit 342ff291 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Use cached displayName from sub db for known SUBs." am: e7dd91b3 am: ef3e9b70 

am: 68a16acc

Change-Id: I4e25ebecae14ef8b342bb839ac56a4426737c393
parents 35f36a87 68a16acc

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -1036,10 +1036,6 @@ public class SubscriptionController extends ISub.Stub { 
                            value.put(SubscriptionManager.SIM_SLOT_INDEX, slotIndex);

                            value.put(SubscriptionManager.SIM_SLOT_INDEX, slotIndex);

                        }

                        }





                        if (nameSource != SubscriptionManager.NAME_SOURCE_USER_INPUT) {

                            setDisplayName = true;

                        }



                        if (oldIccId != null && oldIccId.length() < uniqueId.length()

                        if (oldIccId != null && oldIccId.length() < uniqueId.length()

                                && (oldIccId.equals(IccUtils.getDecimalSubstring(uniqueId)))) {

                                && (oldIccId.equals(IccUtils.getDecimalSubstring(uniqueId)))) {

                            value.put(SubscriptionManager.ICC_ID, uniqueId);

                            value.put(SubscriptionManager.ICC_ID, uniqueId);