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

Commit e394ecae authored by Sandeep Gutta's avatar Sandeep Gutta Committed by Sooraj Sasindran
Browse files

Use SubscriptionController api to set display name 

To broadcast onSubscriptionChange notification when display name
and display number are  updated use SubscriptionController apis
to update display name and number.

Test: manual test with different carrier SIM cards
Bug: 36850457
Change-Id: Ib5fa90385a991b24a884aa34c7dda809ac53e743
parent 8b8f2d0e

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

+2 −16
Original line number Diff line number Diff line
@@ -427,20 +427,12 @@ public class SubscriptionInfoUpdater extends Handler { 
                ContentResolver contentResolver = mContext.getContentResolver();



                if (msisdn != null) {

                    ContentValues number = new ContentValues(1);

                    number.put(SubscriptionManager.NUMBER, msisdn);

                    contentResolver.update(SubscriptionManager.CONTENT_URI, number,

                            SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID + "="

                                    + Long.toString(subId), null);



                    // refresh Cached Active Subscription Info List

                    SubscriptionController.getInstance().refreshCachedActiveSubscriptionInfoList();

                    SubscriptionController.getInstance().setDisplayNumber(msisdn, subId);

                }



                SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(subId);

                String nameToSet;

                String simCarrierName = tm.getSimOperatorName(subId);

                ContentValues name = new ContentValues(1);



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

                        SubscriptionManager.NAME_SOURCE_USER_INPUT) {
@@ -449,14 +441,8 @@ public class SubscriptionInfoUpdater extends Handler { 
                    } else {

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

                    }

                    name.put(SubscriptionManager.DISPLAY_NAME, nameToSet);

                    logd("sim name = " + nameToSet);

                    contentResolver.update(SubscriptionManager.CONTENT_URI, name,

                            SubscriptionManager.UNIQUE_KEY_SUBSCRIPTION_ID

                                    + "=" + Long.toString(subId), null);



                    // refresh Cached Active Subscription Info List

                    SubscriptionController.getInstance().refreshCachedActiveSubscriptionInfoList();

                    SubscriptionController.getInstance().setDisplayName(nameToSet, subId);

                }



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