Merge "Make a copy of the sSlotIndexToSubId's entryset" into oc-dr1-dev (7a6d52fb) · Commits · e / os / android_frameworks_opt_telephony

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;