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

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

Merge "Move refreshCachedActiveSubscriptionInfoList to correct place." into qt-dev 

am: 273fdad8

Change-Id: I7340c3f6b692ee09601e654aec3b0caba97e3356
parents 6afdd50a 273fdad8

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

+4 −4
Original line number Diff line number Diff line
@@ -1093,9 +1093,6 @@ public class SubscriptionController extends ISub.Stub { 
                        if (value.size() > 0) {

                            resolver.update(SubscriptionManager.getUriForSubscriptionId(subId),

                                    value, null, null);



                            // Refresh the Cache of Active Subscription Info List

                            refreshCachedActiveSubscriptionInfoList();

                        }



                        if (DBG) logdl("[addSubInfoRecord] Record already exists");
@@ -1178,8 +1175,11 @@ public class SubscriptionController extends ISub.Stub { 
                }

            }



            if (isSubscriptionForRemoteSim(subscriptionType)) {

            // Refresh the Cache of Active Subscription Info List. This should be done after

            // updating sSlotIndexToSubIds which is done through addToSubIdList() above.

            refreshCachedActiveSubscriptionInfoList();



            if (isSubscriptionForRemoteSim(subscriptionType)) {

                notifySubscriptionInfoChanged();

            } else {  // Handle Local SIM devices

                // Set Display name after sub id is set above so as to get valid simCarrierName