commit 8e0a13e0a6fd6ad00fc52bb7595848f685358534
author Malcolm Chen <refuhoo@google.com> Tue Feb 19 19:43:38 2019 -0800
committer Xiangyu/Malcolm Chen <refuhoo@google.com> Fri Feb 22 00:45:59 2019 +0000
tree b5a4715b7ff43d337d3a7baa6108a4862bafb0ac
parent b39d43a0d11200b1ec2dabd8d1319c7bbcc081fb

Don't return hidden subscription in getActiveSubIdList

Now getActiveSubscriptionInfoList will not return hidden
subscriptions. And getActiveSubIdList should be consistent
with it. For CarrierProvider, it should call the internal
API to see all subscriptions including hidden ones.

Bug: 124690005
Test: manual
Change-Id: Ic208ab93dbaba78d359a66594be9d87b56560c3a

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 1305d0e..7f0a808 100644
--- a/src/com/android/providers/telephony/CarrierIdProvider.java
+++ b/src/com/android/providers/telephony/CarrierIdProvider.java
@@ -604,7 +604,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)) {