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

Commit 2377d465 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Make a copy of the sSlotIndexToSubId's entryset" into oc-dr1-dev am: eae86190 

am: 7a6d52fb

Change-Id: I9f8ef6cb213a61fa3857a243a0184327d826fee3
parents 28ebacb5 7a6d52fb

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

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.Collections;

import java.util.Comparator;

import java.util.HashSet;

import java.util.Iterator;

import java.util.LinkedList;

import java.util.List;
@@ -1821,7 +1822,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;