commit 630823a6710a4a873bad8c3c6ac51e8be8f98ca1
author Xiangyu/Malcolm Chen <refuhoo@google.com> Tue Mar 12 22:59:00 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 22:59:00 2019 +0000
tree 5d349f5208a1049fbc9860653e13980767ec5485
parent 74cee67408b1f9b0c74d2cb4ab87888f22f9c9ff
parent c399f146eb11952e5b86c89c14576c587faf223b

Merge "Don't return hidden subscription in getActiveSubIdList"

src/com/android/providers/telephony/CarrierIdProvider.java

diff --git a/src/com/android/providers/telephony/CarrierIdProvider.java b/src/com/android/providers/telephony/CarrierIdProvider.java
index a2c924c..d4efeb9 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -607,7 +607,7 @@
         if (!SubscriptionController.getInstance().isActiveSubId(subId)) {
             // Remove absent subId from the currentSubscriptionMap.
             final List activeSubscriptions = Arrays.asList(SubscriptionController.getInstance()
-                    .getActiveSubIdList());
+                    .getActiveSubIdList(false));
             int count = 0;
             for (int subscription : mCurrentSubscriptionMap.keySet()) {
                 if (!activeSubscriptions.contains(subscription)) {