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

Commit 52ba1250 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Make a copy of the sSlotIndexToSubId's entryset" am: eebd4b62 

am: fd32a49c

Change-Id: Idc4c40e7883fee6d373e4c553cc6577c20e957f8
parents 20928608 fd32a49c

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

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import java.io.PrintWriter; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.HashSet;

import java.util.Iterator;

import java.util.LinkedList;

import java.util.List;
@@ -1638,7 +1639,7 @@ public class SubscriptionController extends ISub.Stub { 
     */

    @Override

    public int[] getActiveSubIdList() {

        Set<Entry<Integer, Integer>> simInfoSet = sSlotIndexToSubId.entrySet();

        Set<Entry<Integer, Integer>> simInfoSet = new HashSet<>(sSlotIndexToSubId.entrySet());



        int[] subIdArr = new int[simInfoSet.size()];

        int i = 0;