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

Commit 12f8904d authored by Josh Hou's avatar Josh Hou Committed by Automerger Merge Worker
Browse files

Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id"... 

Merge "Remove slot ids from sSlotIndexToSubIds if they have the same sub id" into rvc-dev am: f4b8e278

Change-Id: I072b1e2ce832bea74ea413ca6f0b8a5009efb53d
parents 8f17d1ae f4b8e278

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

+11 −0
Original line number Diff line number Diff line
@@ -3943,6 +3943,17 @@ public class SubscriptionController extends ISub.Stub { 
            sSlotIndexToSubIds.clearSubIdList(slotIndex);

            sSlotIndexToSubIds.addToSubIdList(slotIndex, 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;

    }