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

Commit e44fe6e8 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id" am: 13c6cf87 

Change-Id: I37cdd5e8ca86327f9ae12a7f447394b185723100
parents b31798ee 13c6cf87

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

+11 −0
Original line number Diff line number Diff line
@@ -3728,6 +3728,17 @@ public class SubscriptionController extends ISub.Stub { 
            subIdsList.clear();

            subIdsList.add(subId);

        }





        // Remove the slot from sSlotIndexToSubIds if it has the same sub id with the added slot

        for (Entry<Integer, ArrayList<Integer>> entry : sSlotIndexToSubIds.entrySet()) {

            if (entry.getKey() != slotIndex && entry.getValue() != null

                    && entry.getValue().contains(subId)) {

                logdl("addToSubIdList - remove " + entry.getKey());

                sSlotIndexToSubIds.remove(entry.getKey());

            }

        }



        if (DBG) logdl("slotIndex, subId combo is added to the map.");

        return true;

    }